You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/23 12:21:40 UTC
[11/19] git commit: updated refs/heads/4.9 to 20986ba
CLOUDSTACK-9676 Start instance fails after reverting to a VM snapshot, when there are child VM snapshots
Issue
====
Start instance fails after reverting to a VM snapshot, when there is 1 or more child VM snapshots in the snapshot tree of the VM.
Per the code that detects the presence of a snapshot, we are checking for only current snapshot instead of checking presence of any snapshot in the snapshot tree.
The failure to detect all snapshots means ACP reconfigures the VM in wrong way assuming there are no snapshots for the VM.
This results in start failure.
Fix
===
Ensure correct detection of VM snapshots in the VM snapshot tree
This closes #1828
Signed-off-by: Sateesh Chodapuneedi <sa...@accelerite.com>
(cherry picked from commit 673bb25b5936d1c54e9210781280e9ddc507c830)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0535d77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0535d77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0535d77
Branch: refs/heads/4.9
Commit: b0535d770d108ae219149b5a115c8953d89691d9
Parents: 7d678df
Author: Sateesh Chodapuneedi <sa...@accelerite.com>
Authored: Wed Dec 14 01:52:15 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 13:29:07 2016 +0530
----------------------------------------------------------------------
.../com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0535d77/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 8b9d4e7..22c0b5a 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -661,7 +661,14 @@ public class VirtualMachineMO extends BaseMO {
public boolean hasSnapshot() throws Exception {
VirtualMachineSnapshotInfo info = getSnapshotInfo();
if (info != null) {
- return info.getCurrentSnapshot() != null;
+ ManagedObjectReference currentSnapshot = info.getCurrentSnapshot();
+ if (currentSnapshot != null) {
+ return true;
+ }
+ List<VirtualMachineSnapshotTree> rootSnapshotList = info.getRootSnapshotList();
+ if (rootSnapshotList != null && rootSnapshotList.size() > 0) {
+ return true;
+ }
}
return false;
}