From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 4FBD01FF164 for ; Fri, 4 Jul 2025 15:38:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4593438EEB; Fri, 4 Jul 2025 15:39:08 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Fri, 4 Jul 2025 15:39:01 +0200 Message-Id: <20250704133902.398663-6-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250704133902.398663-1-m.sandoval@proxmox.com> References: <20250704133902.398663-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.098 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH ha-manager v3 5/6] watchdog-mux: break out of loop when updates are disabled X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Without this check, if nfds is zero, the `continue` statement right before of the `break` will prevent from breaking out of the loop and existing the process. If a node does not have corosync quorum, then neither the lrm or crm will update watchdog-mux and this the epoll_wait will timeout, hence nfds is zero in this case. The only case where one could break free from the loop without this commit is if the watchdog updates are stopped, but soon after we regain quorum. In the next commit, the if guards for update_watchdog in the inner guard will be removed, this is done to simplify the review process. Signed-off-by: Maximiliano Sandoval --- src/watchdog-mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/watchdog-mux.c b/src/watchdog-mux.c index 11571ec..4e2bdc6 100644 --- a/src/watchdog-mux.c +++ b/src/watchdog-mux.c @@ -253,7 +253,7 @@ int main(void) { goto err; } - if (nfds == 0) { // timeout + if (nfds == 0 && update_watchdog) { // timeout // check for timeouts if (update_watchdog) { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel