[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.03.04-13-ga2c34ee

[fabbione 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=a2c34ee98442ba23aac8dd3fe6d19b22f3d65b6d

The branch, STABLE2 has been updated
       via  a2c34ee98442ba23aac8dd3fe6d19b22f3d65b6d (commit)
      from  72e56df08d77b3ff2bea852dcf66ce7b3eb6171e (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 a2c34ee98442ba23aac8dd3fe6d19b22f3d65b6d
Author: James Parsons <jparsons at redhat.com>
Date:   Wed Aug 8 15:49:57 2007 +0000

    Fix for 251358

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

Summary of changes:
 fence/agents/egenera/fence_egenera.pl |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl
index 245243e..6970a13 100644
--- a/fence/agents/egenera/fence_egenera.pl
+++ b/fence/agents/egenera/fence_egenera.pl
@@ -14,6 +14,7 @@ $BUILD_DATE="";
 
 # Get the program name from $0 and strip directory names
 $_=$0;
+$|=1;
 s/.*\///;
 my $pname = $_;
 
@@ -150,6 +151,10 @@ sub get_options_stdin
 
 		# FIXME should we do more error checking?  
 		# Excess name/vals will be eaten for now
+		else 
+		{
+			fail "parse error: unknown option \"$opt\"";
+		}
 	}
 }
 
@@ -256,7 +261,7 @@ sub pserver_boot
 		}
 
 		# Is there any harm in sending this command multiple times?
-		my $cmd = "ssh $cserv $esh blade -b $_";
+		my $cmd = "ssh $cserv $esh pserver -b $lpan/$pserv";
 		my $pid = open3 (\*WTR, \*RDR,\*RDR, $cmd)
 			or die "error open3(): $!";
 
@@ -278,11 +283,15 @@ sub pserver_boot
 sub pserver_shutdown
 {
 	my $rtrn=1;
+        local *egen_log;
+        open(egen_log,">/tmp/eglog");
 	for (my $trys=0; $trys<20; $trys++)
 	{
 		last if (pserver_status != 0);
 
+
 		my $status = $_;
+                print egen_log "shutdown: $trys    $status\n";
 		if (/^Shutdown/)
 		{
 			$rtrn=0;
@@ -294,6 +303,12 @@ sub pserver_shutdown
 			# do I need to do anything here?  
 			# We'll just wait for now
 		}
+		elsif (/^Booted\(KDB\)/ || /^Debugging/ )
+		{
+			print egen_log "shutdown: crash dump being performed. Waiting\n";
+			$rtrn=0;
+			last;
+		}
 		else
 		{
 			if (pserver_pblade)
@@ -304,8 +319,12 @@ sub pserver_shutdown
 			# is there any harm in sending this command multiple 
 			# times?
 			my $cmd = "ssh $cserv $esh blade -s $_";
+                        print egen_log "shutdown: $cmd  being called, before open3\n";
 			my $pid = open3 (\*WTR, \*RDR,\*RDR, $cmd)
 				or die "error open3(): $!";
+                        print egen_log "shutdown: after calling open3\n";
+                        @outlines = <RDR>;
+                        print egen_log "shutdown: Open3 result: ", @outlines, "\n";
 
 			close WTR;
 			close RDR;
@@ -316,6 +335,7 @@ sub pserver_shutdown
 
 		sleep 1;
 	}
+        print egen_log "shutdown: Returning from pserver_shutdown with return code $rtrn\n";
 	return $rtrn;
 }
 


hooks/post-receive
--
Cluster Project