From ecd3728bd4a230ff8a9ef4882a4f603245139aa6 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 15 Jan 2010 20:20:35 +0000
Subject: [PATCH] -Remove redundant vcenter prerequisite check that caused
 multiple concurrent migration requests

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4959 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/esx.pm | 31 ++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index 87c1794d5..40cb8d195 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -691,21 +691,28 @@ sub migrate {
     my $tgthyp = $exargs->[0];
     my $destination = ${$args{exargs}}[0];
     my $vcenter = $hyphash{$hyp}->{vcenter}->{name};
+    actually_migrate({
+        nodes=>$nodes,
+        hyp=>$hyp,
+        target=>$tgthyp,
+        vcenter=>$vcenter
+    });
+#The following code is now redundant.  validate_vcenter_prereqs is now called well before this point.
 #We do target first to prevent multiple sources to single destination from getting confused
 #one source to multiple destinations (i.e. revacuate) may require other provisions
 #by getting confused, I mean that actually migrate not thinking both are good before it's correct
-    validate_vcenter_prereqs($tgthyp, \&actually_migrate, {
-        nodes=>$nodes,
-        hyp=>$hyp,
-        target=>$tgthyp,
-        vcenter=>$vcenter
-    });
-    validate_vcenter_prereqs($hyp, \&actually_migrate, {
-        nodes=>$nodes,
-        hyp=>$hyp,
-        target=>$tgthyp,
-        vcenter=>$vcenter
-    });
+#   validate_vcenter_prereqs($tgthyp, \&actually_migrate, {
+#       nodes=>$nodes,
+#       hyp=>$hyp,
+#       target=>$tgthyp,
+#       vcenter=>$vcenter
+#   });
+#   validate_vcenter_prereqs($hyp, \&actually_migrate, {
+#       nodes=>$nodes,
+#       hyp=>$hyp,
+#       target=>$tgthyp,
+#       vcenter=>$vcenter
+#   });
 }
 
 sub reconfig_callback {