cluster: STABLE32 - Apply fixes from John Ruemker to fix some obscure error cases when central processing is enabled.
Ryan McCabe
rmccabe at fedoraproject.org
Tue May 1 19:30:32 UTC 2012
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=87b2cb784db02fad1c54e76af93ea264ea52d1de
Commit: 87b2cb784db02fad1c54e76af93ea264ea52d1de
Parent: 18a65378fdb97db310131fb917a7c3821772c8b0
Author: Ryan McCabe <rmccabe at redhat.com>
AuthorDate: Tue May 1 15:29:43 2012 -0400
Committer: Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Tue May 1 15:29:43 2012 -0400
Apply fixes from John Ruemker to fix some obscure error cases when central processing is enabled.
Signed-off-by: Ryan McCabe <rmccabe at redhat.com>
---
rgmanager/src/daemons/main.c | 8 +++++++-
rgmanager/src/daemons/rg_event.c | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index 02ec5ef..369ea7e 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -458,7 +458,13 @@ dispatch_msg(msgctx_t *ctx, int nodeid, int need_close)
/* Centralized processing or request is from
clusvcadm */
nid = event_master();
- if (nid != my_id()) {
+ if (nid < 0) {
+ logt_print(LOG_ERR, "#40b: Unable to determine "
+ "event master\n");
+ ret = -1;
+ goto out;
+ }
+ else if (nid != my_id()) {
/* Forward the message to the event master */
forward_message(ctx, msg_sm, nid);
} else {
diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c
index a3c12c5..2b78b49 100644
--- a/rgmanager/src/daemons/rg_event.c
+++ b/rgmanager/src/daemons/rg_event.c
@@ -255,7 +255,7 @@ find_master(void)
m = member_list();
if (vf_read(m, "Transition-Master", &vn,
- (void **)(&data), &sz) < 0) {
+ (void **)(&data), &sz) != VFR_OK) {
logt_print(LOG_ERR, "Unable to discover master"
" status\n");
masterinfo = NULL;
More information about the cluster-commits
mailing list