From nobody Mon Apr 29 10:20:21 2024 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 1524738756851977.1367968615564; Thu, 26 Apr 2018 03:32:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC7CD30BEA4D; Thu, 26 Apr 2018 10:32:34 +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 218D37DEFC; Thu, 26 Apr 2018 10:32:34 +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 D0D15180215F; Thu, 26 Apr 2018 10:32:32 +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 w3QAWUXN029953 for ; Thu, 26 Apr 2018 06:32:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8DFF215CDCE; Thu, 26 Apr 2018 10:32:30 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85791215CDCB for ; Thu, 26 Apr 2018 10:32:30 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.usersys.redhat.com [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id 7A37A12001E for ; Thu, 26 Apr 2018 12:32:29 +0200 (CEST) From: Martin Kletzander To: libvir-list@redhat.com Date: Thu, 26 Apr 2018 12:32:27 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2] logging: Don't inhibit shutdown in system daemon 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: , MIME-Version: 1.0 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 26 Apr 2018 10:32:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" That is a job of libvirtd and virtlogd has a dependency on it, so that will prevent it properly. Doing it one extra time in virtlogd might also cause = AVC denials because it is not allowed to call that dbus method. Caused by commit df34363d58bb. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1547250 Signed-off-by: Martin Kletzander Reviewed-by: Daniel P. Berrang=C3=A9 --- I have an idea how to make this way nicer, but it requires a rework and may= be people will not like it as much, so for now this is the preferred fix. v2: - Don't revert the shutdown inhibition for all instances, only for the sys= tem one. v1: - https://www.redhat.com/archives/libvir-list/2018-April/msg02381.html src/logging/log_daemon.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 35d7ebb6d2bb..91bd9d0b9052 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -128,6 +128,12 @@ virLogDaemonInhibitor(bool inhibit, void *opaque) { virLogDaemonPtr dmn =3D opaque; =20 + /* virtlogd uses inhibition only to stop session daemon being killed a= fter + * the specified timeout, for the system daemon this is taken care of = by + * libvirtd and the dependencies between the services. */ + if (virNetDaemonIsPrivileged(dmn->dmn)) + return; + if (inhibit) virNetDaemonAddShutdownInhibition(dmn->dmn); else --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list