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 D296D1FF17A for ; Fri, 4 Jul 2025 15:39:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C8E9C3910B; Fri, 4 Jul 2025 15:39:37 +0200 (CEST) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Fri, 4 Jul 2025 15:39:02 +0200 Message-Id: <20250704133902.398663-7-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 6/6] watchdog-mux: Remove wrapping if guard 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" We check for the same condition in the wrapping if-block added in the previous commit making these redundant. Signed-off-by: Maximiliano Sandoval --- src/watchdog-mux.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/src/watchdog-mux.c b/src/watchdog-mux.c index 4e2bdc6..889cea2 100644 --- a/src/watchdog-mux.c +++ b/src/watchdog-mux.c @@ -256,36 +256,32 @@ int main(void) { if (nfds == 0 && update_watchdog) { // timeout // check for timeouts - if (update_watchdog) { - int i; - time_t ctime = time(NULL); - for (i = 0; i < MAX_CLIENTS; i++) { - if (client_list[i].fd != 0 && client_list[i].time != 0) { - if (client_list[i].warning_state == WARNING_ISSUED && - (ctime - client_list[i].time) <= CLIENT_WATCHDOG_TIMEOUT_WARNING) { - client_list[i].warning_state = FENCE_AVERTED; - fprintf(stderr, "client watchdog was updated before expiring\n"); - } + int i; + time_t ctime = time(NULL); + for (i = 0; i < MAX_CLIENTS; i++) { + if (client_list[i].fd != 0 && client_list[i].time != 0) { + if (client_list[i].warning_state == WARNING_ISSUED && + (ctime - client_list[i].time) <= CLIENT_WATCHDOG_TIMEOUT_WARNING) { + client_list[i].warning_state = FENCE_AVERTED; + fprintf(stderr, "client watchdog was updated before expiring\n"); + } - if (client_list[i].warning_state != WARNING_ISSUED && - (ctime - client_list[i].time) > CLIENT_WATCHDOG_TIMEOUT_WARNING) { - client_list[i].warning_state = WARNING_ISSUED; - fprintf(stderr, "client watchdog is about to expire\n"); - sync_journal_in_fork (); - } + if (client_list[i].warning_state != WARNING_ISSUED && + (ctime - client_list[i].time) > CLIENT_WATCHDOG_TIMEOUT_WARNING) { + client_list[i].warning_state = WARNING_ISSUED; + fprintf(stderr, "client watchdog is about to expire\n"); + sync_journal_in_fork (); + } - if ((ctime - client_list[i].time) > CLIENT_WATCHDOG_TIMEOUT) { - update_watchdog = 0; - fprintf(stderr, "client watchdog expired - disable watchdog updates\n"); - } + if ((ctime - client_list[i].time) > CLIENT_WATCHDOG_TIMEOUT) { + update_watchdog = 0; + fprintf(stderr, "client watchdog expired - disable watchdog updates\n"); } } } - if (update_watchdog) { - if (ioctl(watchdog_fd, WDIOC_KEEPALIVE, 0) == -1) { - perror("watchdog update failed"); - } + if (ioctl(watchdog_fd, WDIOC_KEEPALIVE, 0) == -1) { + perror("watchdog update failed"); } continue; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel