You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/11/29 11:18:39 UTC
[5/6] git commit: updated refs/heads/4.2 to 2fc1161
allow delete snapshot with ERROR state
(cherry picked from commit 81c07f179103e19a0607a6d1a718f28ffc1874ae)
Conflicts:
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/20d8564e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/20d8564e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/20d8564e
Branch: refs/heads/4.2
Commit: 20d8564ed0c9f8b4d33bbfd28c415b933b7a3c50
Parents: 5cada5d
Author: Wei Zhou <w....@leaseweb.com>
Authored: Fri Nov 29 10:55:33 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Nov 29 11:18:07 2013 +0100
----------------------------------------------------------------------
.../cloudstack/storage/snapshot/XenserverSnapshotStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20d8564e/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
index 3d004fe..1fbec8f 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
@@ -195,7 +195,7 @@ public class XenserverSnapshotStrategy extends SnapshotStrategyBase {
return true;
}
- if (!Snapshot.State.BackedUp.equals(snapshotVO.getState())) {
+ if (!Snapshot.State.BackedUp.equals(snapshotVO.getState()) && !Snapshot.State.Error.equals(snapshotVO.getState())) {
throw new InvalidParameterValueException("Can't delete snapshotshot " + snapshotId
+ " due to it is in " + snapshotVO.getState() + " Status");
}