etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as "Failed to migrate the system vm". 

(cherry picked from commit cff312ef74)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
This commit is contained in:
Sanjay Tripathi 2014-01-30 16:17:19 +05:30 committed by Animesh Chaturvedi
parent ccc8aa78cd
commit d7e1d38d48
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -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) {

12
ui/scripts/system.js
View File

@ -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) {