From patchwork Tue Feb 28 16:23:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 9596241 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E75B60574 for ; Tue, 28 Feb 2017 16:26:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7100426CF9 for ; Tue, 28 Feb 2017 16:26:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6591C2853F; Tue, 28 Feb 2017 16:26:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1DB0826CF9 for ; Tue, 28 Feb 2017 16:26:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SGOLOh047554; Tue, 28 Feb 2017 11:24:21 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1SGNssC005765 for ; Tue, 28 Feb 2017 11:23:54 -0500 Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SGNshu023892 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 28 Feb 2017 11:23:54 -0500 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 28E497E9D1 for ; Tue, 28 Feb 2017 16:23:54 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DF1B2ADBB for ; Tue, 28 Feb 2017 16:23:50 +0000 (UTC) From: Martin Wilck To: dm-devel@redhat.com Date: Tue, 28 Feb 2017 17:23:07 +0100 Message-Id: <20170228162329.14517-12-mwilck@suse.com> In-Reply-To: <20170228162329.14517-1-mwilck@suse.com> References: <20170228162329.14517-1-mwilck@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 202 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 28 Feb 2017 16:23:54 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 28 Feb 2017 16:23:54 +0000 (UTC) for IP:'195.135.220.15' DOMAIN:'mx2.suse.de' HELO:'mx2.suse.de' FROM:'mwilck@suse.com' RCPT:'' X-RedHat-Spam-Score: -1.901 (BAYES_50, DCC_REPUT_00_12, RCVD_IN_DNSWL_MED, SPF_PASS) 195.135.220.15 mx2.suse.de 195.135.220.15 mx2.suse.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-loop: dm-devel@redhat.com Subject: [dm-devel] [PATCH 11/33] multipathd: issue systemd READY after initial configuration X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP From: Hannes Reinecke We should be issueing systemd READY only after the initial configuration has been completed, otherwise systemd might continue while the multipath devices are not setup up properly. Signed-off-by: Hannes Reinecke --- multipathd/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index 86d73f7b..cf44778b 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -2361,6 +2361,7 @@ child (void * param) int i; #ifdef USE_SYSTEMD unsigned long checkint; + int startup_done = 0; #endif int rc; int pid_fd = -1; @@ -2509,10 +2510,6 @@ child (void * param) } pthread_attr_destroy(&misc_attr); -#ifdef USE_SYSTEMD - sd_notify(0, "READY=1"); -#endif - while (running_state != DAEMON_SHUTDOWN) { pthread_cleanup_push(config_cleanup, NULL); pthread_mutex_lock(&config_lock); @@ -2534,6 +2531,12 @@ child (void * param) } lock_cleanup_pop(vecs->lock); post_config_state(DAEMON_IDLE); +#ifdef USE_SYSTEMD + if (!startup_done) { + sd_notify(0, "READY=1"); + startup_done = 1; + } +#endif } }