From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9B36360D76 for ; Fri, 25 Sep 2020 14:54:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8F6101B6E2 for ; Fri, 25 Sep 2020 14:53:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 73B461B6D6 for ; Fri, 25 Sep 2020 14:53:54 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 377F443F99 for ; Fri, 25 Sep 2020 14:53:54 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 25 Sep 2020 14:53:49 +0200 Message-Id: <20200925125349.2331629-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.037 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 cluster] pmxcfs sync: properly check for corosync error 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: , X-List-Received-Date: Fri, 25 Sep 2020 12:54:25 -0000 dfsm_send_state_message_full always returns != 0, since it returns cs_error_t which starts with CS_OK at 1, with values >1 representing errors. Signed-off-by: Fabian Grünbichler --- unfortunately not that cause of Alexandre's shutdown/restart issue, but might have caused some hangs as well since we would be stuck in START_SYNC in that case.. data/src/dfsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/dfsm.c b/data/src/dfsm.c index 529c7f9..172d877 100644 --- a/data/src/dfsm.c +++ b/data/src/dfsm.c @@ -1190,7 +1190,7 @@ dfsm_cpg_confchg_callback( dfsm_set_mode(dfsm, DFSM_MODE_START_SYNC); if (lowest_nodeid == dfsm->nodeid) { - if (!dfsm_send_state_message_full(dfsm, DFSM_MESSAGE_SYNC_START, NULL, 0)) { + if (dfsm_send_state_message_full(dfsm, DFSM_MESSAGE_SYNC_START, NULL, 0) != CS_OK) { cfs_dom_critical(dfsm->log_domain, "failed to send SYNC_START message"); goto leave; } -- 2.20.1