From nobody Sat Jul 5 15:15:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521729093852884.0572674745716; Thu, 22 Mar 2018 07:31:33 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 606FF9330F; Thu, 22 Mar 2018 14:31:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46B1480A33; Thu, 22 Mar 2018 14:31:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 53308181BA0E; Thu, 22 Mar 2018 14:22:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2MEMLje017474 for ; Thu, 22 Mar 2018 10:22:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF0D02166BC7; Thu, 22 Mar 2018 14:22:21 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 006AC2166BAE; Thu, 22 Mar 2018 14:22:20 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Mar 2018 14:22:16 +0000 Message-Id: <20180322142216.12550-3-berrange@redhat.com> In-Reply-To: <20180322142216.12550-1-berrange@redhat.com> References: <20180322142216.12550-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] rpc: avoid duplicating config in virtlockd/virtlogd augeas tests X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 22 Mar 2018 14:31:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 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 daemon's don't have separate readonly & readwrite sockets. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/locking/test_virtlockd.aug.in | 13 ++++--------- src/locking/virtlockd.conf | 8 +++----- src/logging/test_virtlogd.aug.in | 15 ++++----------- src/logging/virtlogd.conf | 5 ++++- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/locking/test_virtlockd.aug.in b/src/locking/test_virtlockd= .aug.in index 35095b403c..ad75286be6 100644 --- a/src/locking/test_virtlockd.aug.in +++ b/src/locking/test_virtlockd.aug.in @@ -1,14 +1,9 @@ module Test_virtlockd =3D - let conf =3D "log_level =3D 3 -log_filters=3D\"3:remote 4:event\" -log_outputs=3D\"3:syslog:libvirtd\" -max_clients =3D 10 -admin_max_clients =3D 10 -" + ::CONFIG:: =20 test Virtlockd.lns get conf =3D { "log_level" =3D "3" } { "log_filters" =3D "3:remote 4:event" } - { "log_outputs" =3D "3:syslog:libvirtd" } - { "max_clients" =3D "10" } - { "admin_max_clients" =3D "10" } + { "log_outputs" =3D "3:syslog:virtlockd" } + { "max_clients" =3D "1024" } + { "admin_max_clients" =3D "5" } diff --git a/src/locking/virtlockd.conf b/src/locking/virtlockd.conf index 1b89797344..1a2b27d0b9 100644 --- a/src/locking/virtlockd.conf +++ b/src/locking/virtlockd.conf @@ -53,14 +53,12 @@ # =20 # 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 =3D 1024 =20 -# 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 =3D 5 diff --git a/src/logging/test_virtlogd.aug.in b/src/logging/test_virtlogd.a= ug.in index 1eaab7be9f..744f3246af 100644 --- a/src/logging/test_virtlogd.aug.in +++ b/src/logging/test_virtlogd.aug.in @@ -1,18 +1,11 @@ module Test_virtlogd =3D - let conf =3D "log_level =3D 3 -log_filters=3D\"3:remote 4:event\" -log_outputs=3D\"3:syslog:virtlogd\" -max_clients =3D 10 -admin_max_clients =3D 10 -max_size =3D 131072 -max_backups =3D 3 -" + ::CONFIG:: =20 test Virtlogd.lns get conf =3D { "log_level" =3D "3" } { "log_filters" =3D "3:remote 4:event" } { "log_outputs" =3D "3:syslog:virtlogd" } - { "max_clients" =3D "10" } - { "admin_max_clients" =3D "10" } - { "max_size" =3D "131072" } + { "max_clients" =3D "1024" } + { "admin_max_clients" =3D "5" } + { "max_size" =3D "2097152" } { "max_backups" =3D "3" } diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index 7ef1ac324f..c22b7737ef 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -55,9 +55,12 @@ # =20 # The maximum number of concurrent client connections to allow -# over all sockets combined. +# on primary socket #max_clients =3D 1024 =20 +# The maximum number of concurrent client connections to allow +# on administrative socket +#admin_max_clients =3D 5 =20 # Maximum file size before rolling over. Defaults to 2 MB #max_size =3D 2097152 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list