From c312147c52a13ca01c949e883409db251a2d56ca Mon Sep 17 00:00:00 2001 From: abhishek Date: Thu, 13 Jan 2011 18:21:09 -0800 Subject: [PATCH] bug 7991: blocking cancelmaintenance if sp is in prepareformaintenance status 7991: resolved fixed --- server/src/com/cloud/storage/StorageManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 4af3d142145..be39183397e 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -2260,7 +2260,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag throw new ExecutionException(msg); } - if (primaryStorage.getStatus().equals(Status.Up)) { + if (primaryStorage.getStatus().equals(Status.Up) || primaryStorage.getStatus().equals(Status.PrepareForMaintenance)) { throw new StorageUnavailableException("Primary storage with id " + primaryStorageId + " is not ready to complete migration, as the status is:" + primaryStorage.getStatus().toString(), primaryStorageId); }