External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: avoid duplicating config in virtlockd/virtlogd augeas tests

Browse Source 
Most of the augeas test files use ::CONFIG:: to pull in the master
config file for testing. This ensures that entries added to the config
file are actually tested by augeas.

This identified the missing admin_max_clients example in the virtlogd
config file, which in turn prompted a change in description of the
max_clients parameter, since these daemons don't have separate
readonly & readwrite sockets.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-03-21 16:41:10 +00:00
parent 65824a7e45
commit 76e1720c4f
4 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/locking/test_virtlockd.aug.in
View File

@ -1,14 +1,9 @@
module Test_virtlockd =
let conf = "log_level = 3
log_filters=\"3:remote 4:event\"
log_outputs=\"3:syslog:libvirtd\"
max_clients = 10
admin_max_clients = 10
"
::CONFIG::
test Virtlockd.lns get conf =
{ "log_level" = "3" }
{ "log_filters" = "3:remote 4:event" }
{ "log_outputs" = "3:syslog:libvirtd" }
{ "max_clients" = "10" }
{ "admin_max_clients" = "10" }
{ "log_outputs" = "3:syslog:virtlockd" }
{ "max_clients" = "1024" }
{ "admin_max_clients" = "5" }

8
src/locking/virtlockd.conf
View File

@ -53,14 +53,12 @@
#
# The maximum number of concurrent client connections to allow
# over all sockets combined.
# on primary socket
# Each running virtual machine will require one open connection
# to virtlockd. So 'max_clients' will affect how many VMs can
# be run on a host
#max_clients = 1024
# Same processing controls, but this time for the admin interface.
# For description of each option, be so kind to scroll few lines
# upwards.
# The maximum number of concurrent client connections to allow
# on administrative socket
#admin_max_clients = 5

15
src/logging/test_virtlogd.aug.in
View File

@ -1,18 +1,11 @@
module Test_virtlogd =
let conf = "log_level = 3
log_filters=\"3:remote 4:event\"
log_outputs=\"3:syslog:virtlogd\"
max_clients = 10
admin_max_clients = 10
max_size = 131072
max_backups = 3
"
::CONFIG::
test Virtlogd.lns get conf =
{ "log_level" = "3" }
{ "log_filters" = "3:remote 4:event" }
{ "log_outputs" = "3:syslog:virtlogd" }
{ "max_clients" = "10" }
{ "admin_max_clients" = "10" }
{ "max_size" = "131072" }
{ "max_clients" = "1024" }
{ "admin_max_clients" = "5" }
{ "max_size" = "2097152" }
{ "max_backups" = "3" }

5
src/logging/virtlogd.conf
View File

@ -55,9 +55,12 @@
#
# The maximum number of concurrent client connections to allow
# over all sockets combined.
# on primary socket
#max_clients = 1024
# The maximum number of concurrent client connections to allow
# on administrative socket
#admin_max_clients = 5
# Maximum file size before rolling over. Defaults to 2 MB
#max_size = 2097152