apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7899: reverting a previously wrong fix; adding the right fix

Browse Source 
status 7899: resolved fixed
This commit is contained in:
abhishek 2011-02-01 15:25:10 -08:00
parent ed736e7323
commit db04ec7f90
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2371,13 +2371,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
for (VolumeVO vol : vols) {
Volume.State state = vol.getState();
if (state == Volume.State.Ready) {
if (vol.getPoolId() == null) {
s_logger.warn("Found volume:" + vol.getId() + " with no storage pool associated with it");
throw new StorageUnavailableException("Volume " + vol
+ " has no storage pool associated with it, and the pool id associated with it is:", vol.getPoolId());
}
StoragePoolVO pool = _storagePoolDao.findById(vol.getPoolId());
if (pool.getRemoved() != null || pool.isInMaintenance()) {
if (vol.isRecreatable()) {
@ -2405,7 +2398,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
}
recreateVols.add(vol);
} else {
throw new StorageUnavailableException("Volume " + vol + " can not be used", vol.getPoolId());
//the pool id here can potentially be null if the volume was never associated with any pool id (bug: 7899)
throw new StorageUnavailableException("Volume " + vol + " can not be used", vol.getPoolId() != null ? vol.getPoolId() : null);
}
}