From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 8115A1FF191 for <inbox@lore.proxmox.com>; Mon, 16 Jun 2025 10:37:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4950D3ADC2; Mon, 16 Jun 2025 10:37:56 +0200 (CEST) Message-ID: <e3e15289-f7b4-4f33-8d4b-5aef2862d5a6@proxmox.com> Date: Mon, 16 Jun 2025 10:37:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>, Maximiliano Sandoval <m.sandoval@proxmox.com> References: <20250519130935.365142-1-m.sandoval@proxmox.com> <20250519130935.365142-3-m.sandoval@proxmox.com> Content-Language: en-US From: Aaron Lauterer <a.lauterer@proxmox.com> In-Reply-To: <20250519130935.365142-3-m.sandoval@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.030 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: Re: [pve-devel] [PATCH ha-manager 2/3] watchdog: warn when about to expire X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> On 2025-05-19 15:09, Maximiliano Sandoval wrote: > Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com> > --- > src/watchdog-mux.c | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/src/watchdog-mux.c b/src/watchdog-mux.c > index a9017b3..e14c768 100644 > --- a/src/watchdog-mux.c > +++ b/src/watchdog-mux.c > @@ -29,15 +29,24 @@ > > #define JOURNALCTL_BIN "/bin/journalctl" > > +#define CLIENT_WATCHDOG_TIMEOUT_WARNING 50 some comment why 50 is used would be useful. Or alternatively it maybe could be defined differently a bit further below, using the client_watchdog_timeout as reference: client_watchdog_timeout_warning = client_watchdog_timeout - 10; This way would be clearer then that we want to react to the last 10 seconds before we have the timeout. But that is just some idea. > + > int watchdog_fd = -1; > int watchdog_timeout = 10; > int client_watchdog_timeout = 60; > int update_watchdog = 1; > > +enum warning_state_t { > + NONE, > + WARNING_ISSUED, > + CRISIS_AVERTED, I don't like the "CRISIS" vocabulary here. Why not call it "FENCE_AVERTED" or "HOST_FENCE_AVERTED" ? It sounds less sensational and refers to what is averted > +}; > + > typedef struct { > int fd; > time_t time; > int magic_close; > + enum warning_state_t warning_state; > } wd_client_t; > > #define MAX_CLIENTS 100 > @@ -54,6 +63,7 @@ alloc_client(int fd, time_t time) > client_list[i].fd = fd; > client_list[i].time = time; > client_list[i].magic_close = 0; > + client_list[i].warning_state = NONE; > return &client_list[i]; > } > } > @@ -244,6 +254,22 @@ main(void) > 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 = CRISIS_AVERTED; > + fprintf(stderr, "phew, 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"); > + } > + > if ((ctime - client_list[i].time) > client_watchdog_timeout) { > update_watchdog = 0; > fprintf(stderr, "client watchdog expired - disable watchdog updates\n"); _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel