This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
dlm: master - dlm_controld (pcmk) - bnc#476449 Correctly return thecurrent fencing status
- From: David Teigland <teigland at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 12 Mar 2009 20:44:48 +0000 (UTC)
- Subject: dlm: master - dlm_controld (pcmk) - bnc#476449 Correctly return thecurrent fencing status
Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=730db7b27c0f14689dd5b55893e9ec9eac0044a2
Commit: 730db7b27c0f14689dd5b55893e9ec9eac0044a2
Parent: 230849dd80971678bdcc2255b80b36bf8ab0ae76
Author: Andrew Beekhof <abeekhof@suse.de>
AuthorDate: Thu Mar 12 18:23:03 2009 +0100
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Thu Mar 12 15:41:08 2009 -0500
dlm_controld (pcmk) - bnc#476449 Correctly return the current fencing status
---
group/dlm_controld/pacemaker.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/group/dlm_controld/pacemaker.c b/group/dlm_controld/pacemaker.c
index b737e50..6aa9191 100644
--- a/group/dlm_controld/pacemaker.c
+++ b/group/dlm_controld/pacemaker.c
@@ -309,7 +309,7 @@ static cib_t *cib_connect(void)
}
-int fence_in_progress(int *unused)
+int fence_in_progress(int *in_progress)
{
int rc = 0;
xmlNode *xpath_data;
@@ -323,13 +323,14 @@ int fence_in_progress(int *unused)
rc = cib->cmds->query(cib, "//nvpar[@name='terminate']", &xpath_data,
cib_xpath|cib_scope_local|cib_sync_call);
- log_printf(LOG_INFO, "Fencing in progress: %s", xpath_data?"true":"false");
-
if(xpath_data == NULL) {
+ *in_progress = 0;
return 0;
}
+ log_printf(LOG_INFO, "Fencing in progress: %s", xpath_data?"true":"false");
free_xml(xpath_data);
+ *in_progress = 1;
return 1;
}