etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
anthony 2011-07-07 16:07:11 -07:00
parent b92abc5333
commit a7f8b66813
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -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);