From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6389 invoked by alias); 28 Jul 2009 07:48:46 -0000 Received: (qmail 6383 invoked by alias); 28 Jul 2009 07:48:45 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman: make cman_tool leave remove work even when no services are running. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 5d55508f14db4363cd78759e6988a915fed1a417 X-Git-Newrev: cacde1952b0bd5f913185527349f6c9ad4d2400b From: Christine Caulfield Message-Id: <20090728074813.9D86C120378@lists.fedorahosted.org> Date: Tue, 28 Jul 2009 07:48:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00110.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=cacde1952b0bd5f913185527349f6c9ad4d2400b Commit: cacde1952b0bd5f913185527349f6c9ad4d2400b Parent: 5d55508f14db4363cd78759e6988a915fed1a417 Author: Christine Caulfield AuthorDate: Tue Jul 28 08:46:36 2009 +0100 Committer: Christine Caulfield CommitterDate: Tue Jul 28 08:46:36 2009 +0100 cman: make cman_tool leave remove work even when no services are running. cman_tool leave takes a shortcut internally if no services are listening for shutdown events. Unfortunately, a bug in this shortcut means that the leave flags gets lost, so quorum is not adjusted downwards. This patch fixes that shortcut. I should make it clear that 'leave remove' works fine if any cluster services are running. Signed-off-by: Christine Caulfield --- cman/daemon/commands.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c index 3607864..23ea810 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -1070,8 +1070,13 @@ static int do_cmd_try_shutdown(struct connection *con, char *cmdbuf) /* If no-one is listening for events then we can just go down now */ if (shutdown_expected == 0) { + int leaveflags = CLUSTER_LEAVEFLAG_DOWN; + quit_threads = 1; - send_leave(CLUSTER_LEAVEFLAG_DOWN); + if (shutdown_flags & SHUTDOWN_REMOVE) + leaveflags |= CLUSTER_LEAVEFLAG_REMOVED; + + send_leave(leaveflags); return 0; } else {