From nobody Mon Feb 9 16:45:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585847773; cv=none; d=zohomail.com; s=zohoarc; b=FZC7XH4PkVGfOxQpIQTE5TM5oMxhFSV43nIdBsUOTzJOSKSCgs42HqtoJISi8Ku96tSAH33JhLKC591tTQof+0piOXtu3BgtQLKmLHaPM7bMGYaU44Px5X7PL84e7RxNpWdXDV7Y7OyUObJuzFqL1wA1bGHydCXYMQN+INV3Mis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585847773; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K9EQpbYDHZ0Cr2ClOK9ZSV4qaV4c0vfdZb47/qgmP0I=; b=QkiJn1uJ2CrkWBsh7HjU+uS6ub81dGEGPlM//CpGR6BGRApQ/1A+Vhurzi8hoJGX8DaJmRBYpHWaz8nFEyj2vTXij3uyXwvdpxaJ8EQAwaWUGoXVA5YxAxOX1WALI6xPnfEAnVgE7K/NLtkiPeEozWLTT6n6WQAr17C4aRxffmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585847773269954.1293238962608; Thu, 2 Apr 2020 10:16:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-214-xrMWmfQHORKsy2POxLEedQ-1; Thu, 02 Apr 2020 13:15:20 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F4C6802C9F; Thu, 2 Apr 2020 17:14:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EAE8E9B924; Thu, 2 Apr 2020 17:14:55 +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 A5E29944D8; Thu, 2 Apr 2020 17:14:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 032HEgkX011707 for ; Thu, 2 Apr 2020 13:14:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id B5EEA1001B2D; Thu, 2 Apr 2020 17:14:42 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FE5B1001B28 for ; Thu, 2 Apr 2020 17:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585847771; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=K9EQpbYDHZ0Cr2ClOK9ZSV4qaV4c0vfdZb47/qgmP0I=; b=d25gpkqXyX/AyMGarjWxVqZD6Qb6QOYsyF+yfIuYEQMmT46eaHpZF0WyFXgoyYMDAx2vpL wU0fuXjBMQPJuGrBaVrp5bBayTGi2w5TuwoJ6/vVgMbDz4IRujsgvUp88Hj1Yo2ElMkTRs N6MHMQ1STHhlBrFa+gMlCzE7cGYXLAQ= X-MC-Unique: xrMWmfQHORKsy2POxLEedQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 4/6] systemd: Move timeout from service files to sysconf files Date: Thu, 2 Apr 2020 19:14:29 +0200 Message-Id: <20200402171431.677434-5-abologna@redhat.com> In-Reply-To: <20200402171431.677434-1-abologna@redhat.com> References: <20200402171431.677434-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com 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: , 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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This follows the example set by libvirtd, and makes it easier for the admin to tweak the timeout or disable it altogether. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/interface/virtinterfaced.service.in | 2 +- src/interface/virtinterfaced.sysconf | 2 +- src/libxl/virtxend.service.in | 2 +- src/libxl/virtxend.sysconf | 2 +- src/lxc/virtlxcd.service.in | 2 +- src/lxc/virtlxcd.sysconf | 2 +- src/network/virtnetworkd.service.in | 2 +- src/network/virtnetworkd.sysconf | 2 +- src/node_device/virtnodedevd.service.in | 2 +- src/node_device/virtnodedevd.sysconf | 2 +- src/nwfilter/virtnwfilterd.service.in | 2 +- src/nwfilter/virtnwfilterd.sysconf | 2 +- src/qemu/virtqemud.service.in | 2 +- src/qemu/virtqemud.sysconf | 2 +- src/remote/virtproxyd.service.in | 2 +- src/remote/virtproxyd.sysconf | 2 +- src/secret/virtsecretd.service.in | 2 +- src/secret/virtsecretd.sysconf | 2 +- src/storage/virtstoraged.service.in | 2 +- src/storage/virtstoraged.sysconf | 2 +- src/vbox/virtvboxd.service.in | 2 +- src/vbox/virtvboxd.sysconf | 2 +- src/vz/virtvzd.service.in | 2 +- src/vz/virtvzd.sysconf | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtin= terfaced.service.in index 4dbd7a627b..73d409b81b 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtinterfaced -ExecStart=3D@sbindir@/virtinterfaced --timeout 120 $VIRTINTERFACED_ARGS +ExecStart=3D@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/interface/virtinterfaced.sysconf b/src/interface/virtinter= faced.sysconf index c131f559d2..0685da31b8 100644 --- a/src/interface/virtinterfaced.sysconf +++ b/src/interface/virtinterfaced.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtinterfaced.service systemd unit =20 -VIRTINTERFACED_ARGS=3D"" +VIRTINTERFACED_ARGS=3D"--timeout 120" diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index 8a794647ac..a863917467 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -18,7 +18,7 @@ ConditionPathExists=3D/proc/xen/capabilities [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtxend -ExecStart=3D@sbindir@/virtxend --timeout 120 $VIRTXEND_ARGS +ExecStart=3D@sbindir@/virtxend $VIRTXEND_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure KillMode=3Dprocess diff --git a/src/libxl/virtxend.sysconf b/src/libxl/virtxend.sysconf index 7fa4b7b464..301da47e8d 100644 --- a/src/libxl/virtxend.sysconf +++ b/src/libxl/virtxend.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtxend.service systemd unit =20 -VIRTXEND_ARGS=3D"" +VIRTXEND_ARGS=3D"--timeout 120" diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index 0665f21ee0..3af7c1a52d 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -19,7 +19,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlxcd -ExecStart=3D@sbindir@/virtlxcd --timeout 120 $VIRTLXCD_ARGS +ExecStart=3D@sbindir@/virtlxcd $VIRTLXCD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess Restart=3Don-failure diff --git a/src/lxc/virtlxcd.sysconf b/src/lxc/virtlxcd.sysconf index d342aec88b..119a4a23f3 100644 --- a/src/lxc/virtlxcd.sysconf +++ b/src/lxc/virtlxcd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtlxcd.service systemd unit =20 -VIRTLXCD_ARGS=3D"" +VIRTLXCD_ARGS=3D"--timeout 120" diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd= .service.in index beef277a34..e7f1326945 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnetworkd -ExecStart=3D@sbindir@/virtnetworkd --timeout 120 $VIRTNETWORKD_ARGS +ExecStart=3D@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure KillMode=3Dprocess diff --git a/src/network/virtnetworkd.sysconf b/src/network/virtnetworkd.sy= sconf index fda82c1a76..93f3a7a327 100644 --- a/src/network/virtnetworkd.sysconf +++ b/src/network/virtnetworkd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnetworkd.service systemd unit =20 -VIRTNETWORKD_ARGS=3D"" +VIRTNETWORKD_ARGS=3D"--timeout 120" diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virt= nodedevd.service.in index 4795fc9167..d2453dd620 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnodedevd -ExecStart=3D@sbindir@/virtnodedevd --timeout 120 $VIRTNODEDEVD_ARGS +ExecStart=3D@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/node_device/virtnodedevd.sysconf b/src/node_device/virtnod= edevd.sysconf index 9ffea04634..fa7faa3a79 100644 --- a/src/node_device/virtnodedevd.sysconf +++ b/src/node_device/virtnodedevd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnodedevd.service systemd unit =20 -VIRTNODEDEVD_ARGS=3D"" +VIRTNODEDEVD_ARGS=3D"--timeout 120" diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfil= terd.service.in index 3517232edc..dda7c01a3d 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnwfilterd -ExecStart=3D@sbindir@/virtnwfilterd --timeout 120 $VIRTNWFILTERD_ARGS +ExecStart=3D@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/nwfilter/virtnwfilterd.sysconf b/src/nwfilter/virtnwfilter= d.sysconf index 4d46b6581a..80cc645ba5 100644 --- a/src/nwfilter/virtnwfilterd.sysconf +++ b/src/nwfilter/virtnwfilterd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnwfilterd.service systemd unit =20 -VIRTNWFILTERD_ARGS=3D"" +VIRTNWFILTERD_ARGS=3D"--timeout 120" diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 55a95640b1..8abc9d3a7f 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -19,7 +19,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtqemud -ExecStart=3D@sbindir@/virtqemud --timeout 120 $VIRTQEMUD_ARGS +ExecStart=3D@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess Restart=3Don-failure diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf index 1bab275240..70f76c7c47 100644 --- a/src/qemu/virtqemud.sysconf +++ b/src/qemu/virtqemud.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtqemud.service systemd unit =20 -VIRTQEMUD_ARGS=3D"" +VIRTQEMUD_ARGS=3D"--timeout 120" diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.servi= ce.in index 39d82bb53d..f43ce9ee6e 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtproxyd -ExecStart=3D@sbindir@/virtproxyd --timeout 120 $VIRTPROXYD_ARGS +ExecStart=3D@sbindir@/virtproxyd $VIRTPROXYD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/remote/virtproxyd.sysconf b/src/remote/virtproxyd.sysconf index 805b6185b5..0fc5c61096 100644 --- a/src/remote/virtproxyd.sysconf +++ b/src/remote/virtproxyd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtproxyd.service systemd unit =20 -VIRTPROXYD_ARGS=3D"" +VIRTPROXYD_ARGS=3D"--timeout 120" diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.ser= vice.in index 84f2001028..8444142a3a 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtsecretd -ExecStart=3D@sbindir@/virtsecretd --timeout 120 $VIRTSECRETD_ARGS +ExecStart=3D@sbindir@/virtsecretd $VIRTSECRETD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/secret/virtsecretd.sysconf b/src/secret/virtsecretd.sysconf index 9303dd7bcc..2247d05964 100644 --- a/src/secret/virtsecretd.sysconf +++ b/src/secret/virtsecretd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtsecretd.service systemd unit =20 -VIRTSECRETD_ARGS=3D"" +VIRTSECRETD_ARGS=3D"--timeout 120" diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged= .service.in index a33fb289d5..fc3e9a1b69 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -16,7 +16,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtstoraged -ExecStart=3D@sbindir@/virtstoraged --timeout 120 $VIRTSTORAGED_ARGS +ExecStart=3D@sbindir@/virtstoraged $VIRTSTORAGED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/storage/virtstoraged.sysconf b/src/storage/virtstoraged.sy= sconf index 268d80b902..122373eb7c 100644 --- a/src/storage/virtstoraged.sysconf +++ b/src/storage/virtstoraged.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtstoraged.service systemd unit =20 -VIRTSTORAGED_ARGS=3D"" +VIRTSTORAGED_ARGS=3D"--timeout 120" diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index 8240c45646..ebb31dde07 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -15,7 +15,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvboxd -ExecStart=3D@sbindir@/virtvboxd --timeout 120 $VIRTVBOXD_ARGS +ExecStart=3D@sbindir@/virtvboxd $VIRTVBOXD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/vbox/virtvboxd.sysconf b/src/vbox/virtvboxd.sysconf index a94c8ae23c..37ad353d54 100644 --- a/src/vbox/virtvboxd.sysconf +++ b/src/vbox/virtvboxd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtvboxd.service systemd unit =20 -VIRTVBOXD_ARGS=3D"" +VIRTVBOXD_ARGS=3D"--timeout 120" diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index 15ccfeb172..f551cb8fbf 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -15,7 +15,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvzd -ExecStart=3D@sbindir@/virtvzd --timeout 120 $VIRTVZD_ARGS +ExecStart=3D@sbindir@/virtvzd $VIRTVZD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/vz/virtvzd.sysconf b/src/vz/virtvzd.sysconf index 7db30df94b..a86b9dfb6c 100644 --- a/src/vz/virtvzd.sysconf +++ b/src/vz/virtvzd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtvzd.service systemd unit =20 -VIRTVZD_ARGS=3D"" +VIRTVZD_ARGS=3D"--timeout 120" --=20 2.25.1