From a7f8b66813450bf2c37efd5df96d4b0f084bbefb Mon Sep 17 00:00:00 2001 From: anthony Date: Thu, 7 Jul 2011 16:07:11 -0700 Subject: [PATCH] bug 10611: MS puts primary storage into cancelmaintenace mode, then try to start VMs which were running on top of it, but failed because primary storage is in cancelmaintenace mode fixed status 10611: resolved fixed --- server/src/com/cloud/storage/StorageManagerImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 0ee838179d5..36d4e2d7600 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -2266,8 +2266,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag primaryStorageId); } - // set state to cancelmaintenance - primaryStorage.setStatus(StoragePoolStatus.CancelMaintenance); + // Change the storage state back to up + primaryStorage.setStatus(StoragePoolStatus.Up); _storagePoolDao.update(primaryStorageId, primaryStorage); txn.commit(); @@ -2373,10 +2373,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag throw new ExecutionException(msg); } - // Change the storage state back to up - primaryStorage.setStatus(StoragePoolStatus.Up); - _storagePoolDao.update(primaryStorageId, primaryStorage); - return primaryStorage; } catch (Exception e) { setPoolStateToError(primaryStorage);