From 3e85f480c429ef8f08f64f02f80f4f8626f8353a Mon Sep 17 00:00:00 2001 From: Sateesh Chodapuneedi Date: Thu, 8 Aug 2013 09:00:10 +0530 Subject: [PATCH] CLOUDSTACK-4165 3.0.6 to ASF 4.2 Upgrade: Data Migration step of the Upgrade Fails on "persistLegacyZones" Track the Datacenter of previous cluster correctly while going through each cluster in the zone to see if 2 clusters are from different DC/vCenter. Cherry picked from 4.2 commit a3450afff558d1d04a7dd4697f4d152f3a0aba33 Signed-off-by: Sateesh Chodapuneedi --- .../schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java index 3f3f3bfed95..ffea49f4464 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -629,10 +629,10 @@ public class Upgrade410to420 implements DbUpgrade { tokens = url.split("/"); // url format - http://vcenter/dc/cluster vc = tokens[2]; dcName = tokens[3]; + dcOfPreviousCluster = dcOfCurrentCluster; + dcOfCurrentCluster = dcName + "@" + vc; if (count > 0) { - dcOfPreviousCluster = dcOfCurrentCluster; - dcOfCurrentCluster = dcName + "@" + vc; - if (!dcOfPreviousCluster.equals(dcOfCurrentCluster)) { + if (!dcOfPreviousCluster.equalsIgnoreCase(dcOfCurrentCluster)) { legacyZone = true; s_logger.debug("Marking the zone " + zoneId + " as legacy zone."); }