From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-8373-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 23418 invoked by alias); 20 May 2008 13:46:27 -0000
Received: (qmail 23388 invoked by uid 9476); 20 May 2008 13:46:27 -0000
Date: Tue, 20 May 2008 13:46:00 -0000
Message-ID: <20080520134627.23373.qmail@sourceware.org>
From: lhh@sourceware.org
To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com
Subject: Cluster Project branch, master, updated. cluster-2.99.02-5-g4776995
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 287abb1c13c1304bc949ab649ca864e52b1c3371
X-Git-Newrev: 477699596c98dd6fa05cee1c033371e4e2a79ad2
Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2008-q2/txt/msg00369.txt.bz2

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=477699596c98dd6fa05cee1c033371e4e2a79ad2

The branch, master has been updated
       via  477699596c98dd6fa05cee1c033371e4e2a79ad2 (commit)
      from  287abb1c13c1304bc949ab649ca864e52b1c3371 (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 477699596c98dd6fa05cee1c033371e4e2a79ad2
Author: Lon Hohberger <lhh@redhat.com>
Date:   Tue May 20 09:46:13 2008 -0400

    [rgmanager] Apply patch from Marcelo Azevedo to make migration more robust
    
    * Adds a mapping of cluster nodes to private hostnames for migration
      paths
    * Makes migration status reporting more robust

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

Summary of changes:
 rgmanager/src/resources/vm.sh |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
index f192e2d..798f8a1 100755
--- a/rgmanager/src/resources/vm.sh
+++ b/rgmanager/src/resources/vm.sh
@@ -136,6 +136,16 @@ meta_data()
             <content type="integer"/>
         </parameter>
 
+       <parameter name="migration_mapping">
+           <longdesc lang="en">
+               Mapping of the hostname of a target cluster member to a different hostname
+           </longdesc>
+           <shortdesc lang="en">
+               memeberhost:targethost,memeberhost:targethost ..
+           </shortdesc>
+            <content type="string"/>
+        </parameter>
+
 	<parameter name="bootloader">
 	    <longdesc lang="en">
 		Boot loader that can start the VM from physical image
@@ -478,8 +488,14 @@ migrate()
 	if [ "$OCF_RESKEY_migrate" = "live" ]; then
 		migrate_opt="-l"
 	fi
-	
-	err=$(xm migrate $migrate_opt $OCF_RESKEY_name $target 2>&1 | head -1)
+
+	# Patch from Marcelo Azevedo to migrate over private
+	# LANs instead of public LANs
+        if [ -n $OCF_RESKEY_migration_mapping ] ; then
+                target=${OCF_RESKEY_migration_mapping#*$target:} target=${target%%,*}
+        fi
+
+	err=$(xm migrate $OCF_RESKEY_name $target 2>&1 | head -1; exit ${PIPESTATUS[0]})
 	rv=$?
 
 	if [ $rv -ne 0 ]; then


hooks/post-receive
--
Cluster Project