From d7e1d38d48f7362944092755e0ea0b5f025aab8b Mon Sep 17 00:00:00 2001 From: Sanjay Tripathi Date: Thu, 30 Jan 2014 16:17:19 +0530 Subject: [PATCH] CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as "Failed to migrate the system vm". (cherry picked from commit cff312ef743763c69b0c3b0cfd9faf906f3cf22c) Signed-off-by: Animesh Chaturvedi --- server/src/com/cloud/vm/UserVmManagerImpl.java | 7 ++++++- ui/scripts/system.js | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 363c663250f..d9923d238e1 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -4216,7 +4216,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir collectVmDiskStatistics(uservm); } _itMgr.migrate(vm.getUuid(), srcHostId, dest); - return _vmDao.findById(vmId); + VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId); + if (vmInstance.getType().equals(VirtualMachine.Type.User)) { + return _vmDao.findById(vmId); + } else { + return vmInstance; + } } private boolean checkIfHostIsDedicated(HostVO host) { diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 960f1aa488a..72f9e338d5a 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -2508,7 +2508,7 @@ getUpdatedItem: function(json) { //return json.queryasyncjobresultresponse.jobresult.systemvminstance; //not all properties returned in systemvminstance $.ajax({ - url: createURL("listRouters&id=" + json.queryasyncjobresultresponse.jobresult.systemvminstance.id), + url: createURL("listRouters&id=" + json.queryasyncjobresultresponse.jobresult.systemvm.id), dataType: "json", async: false, success: function(json) { @@ -3030,7 +3030,7 @@ getUpdatedItem: function(json) { //return json.queryasyncjobresultresponse.jobresult.systemvminstance; //not all properties returned in systemvminstance $.ajax({ - url: createURL("listInternalLoadBalancerVMs&id=" + json.queryasyncjobresultresponse.jobresult.systemvminstance.id), + url: createURL("listInternalLoadBalancerVMs&id=" + json.queryasyncjobresultresponse.jobresult.systemvm.id), dataType: "json", async: false, success: function(json) { @@ -3624,7 +3624,7 @@ getUpdatedItem: function(json) { //return json.queryasyncjobresultresponse.jobresult.systemvminstance; //not all properties returned in systemvminstance $.ajax({ - url: createURL("listRouters&id=" + json.queryasyncjobresultresponse.jobresult.systemvminstance.id), + url: createURL("listRouters&id=" + json.queryasyncjobresultresponse.jobresult.systemvm.id), dataType: "json", async: false, success: function(json) { @@ -6788,7 +6788,7 @@ getUpdatedItem: function(json) { //return json.queryasyncjobresultresponse.jobresult.systemvminstance; //not all properties returned in systemvminstance $.ajax({ - url: createURL("listSystemVms&id=" + json.queryasyncjobresultresponse.jobresult.systemvminstance.id), + url: createURL("listSystemVms&id=" + json.queryasyncjobresultresponse.jobresult.systemvm.id), dataType: "json", async: false, success: function(json) { @@ -7941,7 +7941,7 @@ getUpdatedItem: function(json) { //return json.queryasyncjobresultresponse.jobresult.systemvminstance; //not all properties returned in systemvminstance $.ajax({ - url: createURL("listRouters&id=" + json.queryasyncjobresultresponse.jobresult.systemvminstance.id), + url: createURL("listRouters&id=" + json.queryasyncjobresultresponse.jobresult.systemvm.id), dataType: "json", async: false, success: function(json) { @@ -9167,7 +9167,7 @@ getUpdatedItem: function(json) { //return json.queryasyncjobresultresponse.jobresult.systemvminstance; //not all properties returned in systemvminstance $.ajax({ - url: createURL("listSystemVms&id=" + json.queryasyncjobresultresponse.jobresult.systemvminstance.id), + url: createURL("listSystemVms&id=" + json.queryasyncjobresultresponse.jobresult.systemvm.id), dataType: "json", async: false, success: function(json) {