cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [2/2] git commit: updated refs/heads/4.3 to 4034aad
Date Thu, 19 Dec 2013 10:23:28 GMT
CLOUDSTACK-5208: upgrade from 3.0.6 to 4.3 is not throwing any exception if new System VM template
is not registered with proper name Commit ae231444bc885ee5e9a5d4bb3003bef651c849d6 Commented
the exception. .


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

Branch: refs/heads/4.3
Commit: 4034aad250106eaaa85c7f57df12965c878fb2c1
Parents: 1c6b146
Author: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Authored: Mon Dec 16 10:56:15 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Thu Dec 19 15:46:16 2013 +0530

----------------------------------------------------------------------
 engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4034aad2/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 0b57a0c..ad3af2b 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -729,7 +729,7 @@ public class Upgrade410to420 implements DbUpgrade {
                         pstmt.close();
                     } else {
                         if (hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())){
-                            // throw new CloudRuntimeException("4.2.0 " + hypervisorAndTemplateName.getKey()
+ " SystemVm template not found. Cannot upgrade system Vms");
+                            throw new CloudRuntimeException("4.2.0 " + hypervisorAndTemplateName.getKey()
+ " SystemVm template not found. Cannot upgrade system Vms");
                         } else {
                             s_logger.warn("4.2.0 " + hypervisorAndTemplateName.getKey() +
" SystemVm template not found. " + hypervisorAndTemplateName.getKey() + " hypervisor is not
used, so not failing upgrade");
                             // Update the latest template URLs for corresponding hypervisor


Mime
View raw message