Repository: cloudstack
Updated Branches:
  refs/heads/master b40d9c23f -> b036c32bf


if concurrent snapshot happening on the same vm, throw invalid parameter
exception to user.
Reviewed-by: Frank


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b036c32b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b036c32b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b036c32b

Branch: refs/heads/master
Commit: b036c32bfc39c6195b1316da77fa949dbb6e44e2
Parents: b40d9c2
Author: Edison Su <sudi...@gmail.com>
Authored: Tue Dec 9 15:38:58 2014 -0800
Committer: Edison Su <sudi...@gmail.com>
Committed: Wed Dec 17 14:35:15 2014 -0800

----------------------------------------------------------------------
 server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b036c32b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index b224beb..0591175 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -956,7 +956,7 @@ public class SnapshotManagerImpl extends ManagerBase 
implements SnapshotManager,
                     List<SnapshotVO> activeSnapshots =
                         _snapshotDao.listByInstanceId(volume.getInstanceId(), 
Snapshot.State.Creating, Snapshot.State.CreatedOnPrimary, 
Snapshot.State.BackingUp);
                     if (activeSnapshots.size() > 0) {
-                        throw new CloudRuntimeException("There is other active 
snapshot tasks on the instance to which the volume is attached, please try 
again later");
+                        throw new InvalidParameterValueException("There is 
other active snapshot tasks on the instance to which the volume is attached, 
please try again later");
                     }
                 }
 

Reply via email to