From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id A65B51FF17C for ; Wed, 23 Jul 2025 12:54:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 878FAE166; Wed, 23 Jul 2025 12:55:22 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Wed, 23 Jul 2025 12:54:37 +0200 Message-ID: <20250723105518.272549-1-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753268108388 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.096 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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] watchdog-mux: Restore if guard for watchdog updates 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" In commit c26b474 the if condition was removed in favor of the if guard on the higher level. However, this introduced functional change, the watchdog now updates immediately after update_watchdog is set to 0, potentially causing fencing after x+1 seconds instead of x seconds. This behavior is incorrect because updating the watchdog after declaring no more updates makes no logical sense. Signed-off-by: Maximiliano Sandoval --- src/watchdog-mux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/watchdog-mux.c b/src/watchdog-mux.c index 889cea2..272060d 100644 --- a/src/watchdog-mux.c +++ b/src/watchdog-mux.c @@ -280,8 +280,10 @@ int main(void) { } } - if (ioctl(watchdog_fd, WDIOC_KEEPALIVE, 0) == -1) { - perror("watchdog update failed"); + if (update_watchdog) { + if (ioctl(watchdog_fd, WDIOC_KEEPALIVE, 0) == -1) { + perror("watchdog update failed"); + } } continue; -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel