From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23029 invoked by alias); 13 Aug 2009 13:54:59 -0000 Received: (qmail 23004 invoked by alias); 13 Aug 2009 13:54:58 -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: fix error if corosync takes >1s to start up 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: 99b2899ede7e9b0b4b7429de58397f55786bac4a X-Git-Newrev: ce1d15f96aed3e37872d9f8e1d6e70aa0865f7e4 From: Christine Caulfield Message-Id: <20090813135430.4E9B0120202@lists.fedorahosted.org> Date: Thu, 13 Aug 2009 13:54: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/msg00198.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ce1d15f96aed3e37872d9f8e1d6e70aa0865f7e4 Commit: ce1d15f96aed3e37872d9f8e1d6e70aa0865f7e4 Parent: 99b2899ede7e9b0b4b7429de58397f55786bac4a Author: Christine Caulfield AuthorDate: Thu Aug 13 14:52:58 2009 +0100 Committer: Christine Caulfield CommitterDate: Thu Aug 13 14:52:58 2009 +0100 cman: fix error if corosync takes >1s to start up If corosync takes too long to start up then cman_tool quits with an error saying that it didn't start. This fixes that by correcting the abuses of the select return status. Signed-off-by: Christine Caulfield --- cman/cman_tool/join.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cman/cman_tool/join.c b/cman/cman_tool/join.c index 78c400e..7d9a1dc 100644 --- a/cman/cman_tool/join.c +++ b/cman/cman_tool/join.c @@ -265,7 +265,7 @@ int join(commandline_t *comline, char *main_envp[]) if (sscanf(messageptr, "FORKED: %d", &corosync_pid) == 1) { if (comline->verbose & DEBUG_STARTUP_ONLY) fprintf(stderr, "forked process ID is %d\n", corosync_pid); - status = 1; + status = 0; /* There might be a SUCCESS or error message in the pipe too. */ messageptr = strchr(messageptr, '\n'); @@ -278,7 +278,6 @@ int join(commandline_t *comline, char *main_envp[]) if (sscanf(messageptr, "SUCCESS: %d", &corosync_pid) == 1) { if (comline->verbose & DEBUG_STARTUP_ONLY) fprintf(stderr, "corosync running, process ID is %d\n", corosync_pid); - status = 0; break; } else if (messageptr) { @@ -294,7 +293,7 @@ int join(commandline_t *comline, char *main_envp[]) } } - } while (status != 0); + } while (status == 0); close(p[0]); /* If corosync has started, try to connect to cman ... if it's still there */