cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject git commit: updated refs/heads/master to 3e85f48
Date Thu, 08 Aug 2013 09:02:42 GMT
Updated Branches:
  refs/heads/master e1e4642d6 -> 3e85f480c


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 <sateesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e85f480
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e85f480
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e85f480

Branch: refs/heads/master
Commit: 3e85f480c429ef8f08f64f02f80f4f8626f8353a
Parents: e1e4642
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Thu Aug 8 09:00:10 2013 +0530
Committer: Sateesh Chodapuneedi <sateesh@apache.org>
Committed: Thu Aug 8 09:02:17 2013 +0530

----------------------------------------------------------------------
 engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e85f480/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 3f3f3bf..ffea49f 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.");
                                 }


Mime
View raw message