From mboxrd@z Thu Jan 1 00:00:00 1970 From: teigland@sourceware.org Date: 23 Jul 2008 18:15:03 -0000 Subject: [Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-162-g9567fe1 Message-ID: <20080723181503.902.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9567fe17bf33eb0008831551b76c7f46c55ba40b The branch, RHEL5 has been updated via 9567fe17bf33eb0008831551b76c7f46c55ba40b (commit) from 5ff7b6671b739796e5c3f4f2f8cc0005015936cc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9567fe17bf33eb0008831551b76c7f46c55ba40b Author: David Teigland Date: Wed Jul 23 12:57:49 2008 -0500 fenced: update cman only after complete success bz 456403 Problem discovered by Lon: tell cman about a completed fencing operation only after all devices within a method have completed successfully. Otherwise, if the first device succeeds, cman will be told the node is fenced, even if the second device fails. When fenced subsequently retries the fencing, it asks cman if fencing is complete, and is wrongly told it is (the purpose of asking cman is to avoid double fencing when a node is fenced externally via fence_node). So, a failed node can be considered successfully fenced when it hasn't been. Signed-off-by: David Teigland ----------------------------------------------------------------------- Summary of changes: fence/fenced/agent.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fence/fenced/agent.c b/fence/fenced/agent.c index 0577e8f..66ae77a 100644 --- a/fence/fenced/agent.c +++ b/fence/fenced/agent.c @@ -304,9 +304,12 @@ void update_cman(char *victim, char *method) int dispatch_fence_agent(char *victim, int force) { + char good_device[256]; char *method = NULL, *device = NULL; int num_methods, num_devices, m, d, error = -1, cd; + strcpy(good_device, "UNKNOWN"); + if (force) cd = ccs_force_connect(NULL, 0); else { @@ -331,16 +334,13 @@ int dispatch_fence_agent(char *victim, int force) if (error == -EBADR) { syslog(LOG_INFO, "ccs connection timed out, " "retrying\n"); - while ((cd = ccs_connect()) < 0) sleep(1); - error = get_method(cd, victim, m, &method); - + } + if (error) continue; - } else if (error) - continue; /* if num_devices is zero we should return an error */ error = -1; @@ -356,7 +356,7 @@ int dispatch_fence_agent(char *victim, int force) if (error) break; - update_cman(victim, device); + strncpy(good_device, device, sizeof(good_device)); free(device); device = NULL; } @@ -365,8 +365,10 @@ int dispatch_fence_agent(char *victim, int force) free(device); free(method); - if (!error) + if (!error) { + update_cman(victim, good_device); break; + } } ccs_disconnect(cd); hooks/post-receive -- Cluster Project