[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-60-g12bd7c0

[teigland at 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=12bd7c01cac39996f7b4a481bb476b141bf46149

The branch, master has been updated
       via  12bd7c01cac39996f7b4a481bb476b141bf46149 (commit)
      from  534045c7da331333e5389c4f25356931bebb583e (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 12bd7c01cac39996f7b4a481bb476b141bf46149
Author: David Teigland <teigland at redhat.com>
Date:   Mon Jun 23 16:37:44 2008 -0500

    dlm_controld/gfs_controld: minor fixes
    
    dlm_controld shouldn't close libdlmcontrol connections that are
    meant to be persistent.
    
    gfs_controld shouldn't call start_kernel every time through
    process_mountgroup() after it's completed.
    
    Signed-off-by: David Teigland <teigland at redhat.com>

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

Summary of changes:
 group/dlm_controld/main.c    |    2 +-
 group/gfs_controld/cpg-new.c |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index 7c0799a..aaaa2c4 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -636,6 +636,7 @@ static void process_connection(int ci)
 		ls = find_ls(h.name);
 		if (ls)
 			send_cycle_start(ls);
+		client_dead(ci);
 		break;
 
 	default:
@@ -645,7 +646,6 @@ static void process_connection(int ci)
  out:
 	if (extra)
 		free(extra);
-	client_dead(ci);
 }
 
 static void process_listener(int ci)
diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c
index f44abaf..f765e48 100644
--- a/group/gfs_controld/cpg-new.c
+++ b/group/gfs_controld/cpg-new.c
@@ -1997,12 +1997,7 @@ static void recover_and_start(struct mountgroup *mg)
 	   is received, check whether any more journals need recovery.  If
 	   so, start recovery on the next one, if not, start the kernel. */
 
-	if (wait_recoveries_done(mg)) {
-		/* will first mounter get an error in start_kernel
-		   the first time it's called after first mount? */
-		log_group(mg, "recover_and_start start_kernel");
-		start_kernel(mg);
-	} else {
+	if (!wait_recoveries_done(mg)) {
 		if (!mg->kernel_mount_done || mg->kernel_mount_error)
 			return;
 		if (mg->spectator)
@@ -2011,6 +2006,11 @@ static void recover_and_start(struct mountgroup *mg)
 			return;
 		if (pick_journal_to_recover(mg, &jid))
 			start_journal_recovery(mg, jid);
+	} else {
+		if (!mg->kernel_stopped)
+			return;
+		log_group(mg, "recover_and_start start_kernel");
+		start_kernel(mg);
 	}
 }
 


hooks/post-receive
--
Cluster Project