[Cluster-devel] Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-112-gb611004

[lhh@sourceware.org <lhh@sourceware.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=b611004d87126adf8422c965dc8c54b26fcf0ff9

The branch, RHEL4 has been updated
       via  b611004d87126adf8422c965dc8c54b26fcf0ff9 (commit)
       via  558b13c7c677879bc83f3ad1ac78a1181c1ccef3 (commit)
      from  e7cd689f414088e96fc58c199d7c38c4b558c93d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b611004d87126adf8422c965dc8c54b26fcf0ff9
Author: Lon Hohberger <lhh@redhat.com>
Date:   Thu Jul 24 16:03:55 2008 -0400

    [qdisk] Make stop_cman="1" work if heuristics fail during initialization
    
    Bugzilla #452137

commit 558b13c7c677879bc83f3ad1ac78a1181c1ccef3
Author: Lon Hohberger <lhh@redhat.com>
Date:   Wed Jun 11 14:10:46 2008 -0400

    [qdisk] Fix exit case due to wrong daemon_init prototype
    
    Reported via mailing list by Stephan Windm??ller

-----------------------------------------------------------------------

Summary of changes:
 cman/qdisk/main.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index a29a5d0..a66402b 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -47,7 +47,7 @@
 #include <cluster/cnxman-socket.h>
 #endif
 
-int daemon_init(char *);
+void daemon_init(char *);
 int check_process_running(char *, pid_t *);
 
 /*
@@ -508,6 +508,8 @@ quorum_init(qd_ctx *ctx, node_info_t *ni, int max, struct h_data *h, int maxh)
 
 	get_my_score(&score, &maxscore);
 	clulog(LOG_INFO, "Initial score %d/%d\n", score, maxscore);
+	if ((ctx->qc_flags & RF_STOP_CMAN) && (score < score_req))
+		return -1;
 	clulog(LOG_INFO, "Initialization complete\n");
 
 	return 0;
@@ -1460,10 +1462,8 @@ main(int argc, char **argv)
 #endif
 	if (!ch) {
 		if (!foreground && !forked) {
-			if (daemon_init(argv[0]) < 0)
-				return -1;
-			else
-				forked = 1;
+			daemon_init(argv[0]);
+			forked = 1;
 		}
 		
 		clulog(LOG_INFO, "Waiting for CMAN to start\n");


hooks/post-receive
--
Cluster Project