Upgrade: Fix a logic bug in default SC determination

eucalyptus · Jan 8, 2012 · b4e1f39 · b4e1f39
1 parent 0d2bfa1
commit b4e1f39
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/clc/modules/core/conf/upgrade/upgrade_20_30.groovy b/clc/modules/core/conf/upgrade/upgrade_20_30.groovy
@@ -591,10 +591,12 @@ class upgrade_20_30 extends AbstractUpgradeScript {
                 if (vol.cluster == "default") {
                     vol.cluster = System.getProperty("euca.storage.name");
                 }
-                if (vol.cluster == null && vol_meta != null) {
-                    vol.cluster = vol_meta.sc_name;
-                } else {
-                    throw new RuntimeException("Cannot determine SC for volume " + vol.displayname);
+                if (vol.cluster == null) {
+                    if (vol_meta != null) {
+                        vol.cluster = vol_meta.sc_name;
+                    } else {
+                        throw new RuntimeException("Cannot determine SC for volume " + vol.displayname);
+                    }
                 }
                 // Second "vol.cluster" is partition name
                 Volume v = new Volume( ufn, vol.displayname, vol.size, vol.cluster + '_sc', vol.cluster, vol.parentsnapshot );