public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE2 - cman: let 'cman-tool leave -w' wait even if shutdown has already started
@ 2009-01-02 13:06 Christine Caulfield
  0 siblings, 0 replies; only message in thread
From: Christine Caulfield @ 2009-01-02 13:06 UTC (permalink / raw)
  To: cluster-cvs-relay

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=722f9dcf697bcb93d1387b793dd5b915201fd9f0
Commit:        722f9dcf697bcb93d1387b793dd5b915201fd9f0
Parent:        7c75c1d88c4b4aef4475df26c49637ca9ec026c5
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:05:47 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 f4bd81d..b1c862d 100644
--- a/cman/cman_tool/main.c
+++ b/cman/cman_tool/main.c
@@ -554,7 +554,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);


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-01-02 13:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-02 13:06 cluster: STABLE2 - cman: let 'cman-tool leave -w' wait even if shutdown has already started Christine Caulfield

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).