cluster: master - cman: let 'cman-tool leave -w' wait even if shutdown has already started

Christine Caulfield chrissie@fedoraproject.org
Fri Jan 2 13:06:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=64cbd506b3abf6f75444a8f5d23896386f48667e
Commit:        64cbd506b3abf6f75444a8f5d23896386f48667e
Parent:        88bea81933b3dfbe0b9dfe53db6003d9f4a11f70
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Fri Jan 2 13:04:18 2009 +0000
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Fri Jan 2 13:04:18 2009 +0000

cman: let 'cman-tool leave -w' wait even if shutdown has already started

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
 cman/cman_tool/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c
index c48083b..a6d35ca 100644
--- a/cman/cman_tool/main.c
+++ b/cman/cman_tool/main.c
@@ -561,7 +561,7 @@ static void leave(commandline_t *comline)
 	}
 
 	result = cman_shutdown(h, flags);
-	if (result) {
+	if (result && !comline->wait_opt) {
 		die("Error leaving cluster: %s", cman_error(errno));
 	}
 	cman_finish(h);



More information about the Cluster-cvs mailing list