You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/01/30 12:06:29 UTC
git commit: updated refs/heads/master to 20fd276
Updated Branches:
refs/heads/master dfe744c4a -> 20fd2769a
CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as ""Failed to migrate the system vm"".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/20fd2769
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/20fd2769
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/20fd2769
Branch: refs/heads/master
Commit: 20fd2769a91435e1d33af87bb047c831f4f06951
Parents: dfe744c
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Thu Jan 30 16:26:52 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Thu Jan 30 16:29:18 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/vm/UserVmManagerImpl.java | 7 ++++++-
ui/scripts/system.js | 14 +++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20fd2769/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 1dcaf79..7efea69 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3933,7 +3933,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) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20fd2769/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 870b433..4c0543e 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -2547,7 +2547,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) {
@@ -3073,7 +3073,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) {
@@ -3671,7 +3671,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) {
@@ -6264,7 +6264,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) {
@@ -7720,7 +7720,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) {
@@ -8892,7 +8892,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) {
@@ -10117,7 +10117,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) {