From 3f1283fdaf1f85999ddcd058f50566734fe81670 Mon Sep 17 00:00:00 2001 From: prachi Date: Fri, 13 Jul 2012 11:29:52 -0700 Subject: [PATCH] CS-15407 [2.2.14 to 3.0.4 upgrade] After upgrade VLAN allocation doesn't happen properly for multiple physical networks Reviewed-By: Alena Changes: - Upgrade insturctions updated to secify 'isolated' networks --- server/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 4 ++-- server/src/com/cloud/upgrade/dao/Upgrade303to304.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java index 1f3ffa67200..03b51eafac8 100755 --- a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -178,10 +178,10 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { if(rsVNet.next()){ String message = "Cannot upgrade. Your setup has multiple Physical Networks and is using guest Vnet that is assigned wrongly. To upgrade, first correct the setup by doing the following: \n" + "1. Please rollback to your 2.2.14 setup\n" + - "2. Please stop all VMs through CloudStack\n" + + "2. Please stop all VMs using isolated(virtual) networks through CloudStack\n" + "3. Run following query to find if any networks still have nics allocated:\n\t"+ "a) check if any virtual guest networks still have allocated nics by running:\n\t" + - "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"+ + "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"+ "b) If this returns any networkd ids, then ensure that all VMs are stopped, no new VM is being started, and then shutdown management server\n\t"+ "c) Clean up the nics count for the 'virtual' network id's returned in step (a) by running this:\n\t"+ "UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = \n\t"+ diff --git a/server/src/com/cloud/upgrade/dao/Upgrade303to304.java b/server/src/com/cloud/upgrade/dao/Upgrade303to304.java index 68df5fc751f..c992902ca4a 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade303to304.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade303to304.java @@ -175,10 +175,10 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade { String message = "Cannot upgrade. Your setup has multiple Physical Networks and is using guest Vnet that is assigned wrongly. To upgrade, first correct the setup by doing the following: \n" + "1. Please rollback to your 2.2.14 setup\n" + - "2. Please stop all VMs through CloudStack\n" + + "2. Please stop all VMs using isolated(virtual) networks through CloudStack\n" + "3. Run following query to find if any networks still have nics allocated:\n\t"+ "a) check if any virtual guest networks still have allocated nics by running:\n\t" + - "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"+ + "SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual';\n\t"+ "b) If this returns any networkd ids, then ensure that all VMs are stopped, no new VM is being started, and then shutdown management server\n\t"+ "c) Clean up the nics count for the 'virtual' network id's returned in step (a) by running this:\n\t"+ "UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = \n\t"+