From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ryan McCabe Date: Fri, 27 Jul 2012 13:07:15 -0400 Subject: [Cluster-devel] [PATCH] rgmanager: Exit uncleanly only when CMAN_SHUTDOWN_ANYWAY is set Message-ID: <20120727170712.GA148843@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Only exit uncleanly when the CMAN_SHUTDOWN_ANYWAY flag is set in the argument passed when handling the CMAN_REASON_TRY_SHUTDOWN event. This fixes the case where args is 2, where we want to refuse to shut down. Resolves: rhbz#769730 Signed-off-by: Ryan McCabe --- rgmanager/src/clulib/msg_cluster.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rgmanager/src/clulib/msg_cluster.c b/rgmanager/src/clulib/msg_cluster.c index e864853..e4b6b39 100644 --- a/rgmanager/src/clulib/msg_cluster.c +++ b/rgmanager/src/clulib/msg_cluster.c @@ -211,7 +211,7 @@ poll_cluster_messages(int timeout) if (cman_dispatch(ch, 0) < 0) { process_cman_event(ch, NULL, - CMAN_REASON_TRY_SHUTDOWN, 1); + CMAN_REASON_TRY_SHUTDOWN, CMAN_SHUTDOWN_ANYWAY); } ret = 0; } @@ -987,7 +987,9 @@ process_cman_event(cman_handle_t handle, void *private, int reason, int arg) printf("EVENT: %p %p %d %d\n", handle, private, reason, arg); #endif - if (reason == CMAN_REASON_TRY_SHUTDOWN && !arg) { + if (reason == CMAN_REASON_TRY_SHUTDOWN && + !(arg & CMAN_SHUTDOWN_ANYWAY)) + { cman_replyto_shutdown(handle, 0); return; } -- 1.7.11.2