apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10293: don't destroy volume if it's not created

Browse Source 
status 10293: resolved fixed
This commit is contained in:
Edison Su 2011-06-15 14:38:37 -04:00
parent 2e8d1bbd6c
commit dca3405b8b
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -755,18 +755,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
s_logger.debug("Retrying the create because it failed on pool " + pool);
}
Transaction txn = Transaction.currentTxn();
txn.start();
if (created == null) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Unable to create a volume for " + volume);
}
volume.setState(Volume.State.Destroy);
_volsDao.persist(volume);
_volsDao.remove(volume.getId());
UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_DELETE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName());
_usageEventDao.persist(usageEvent);
volume = null;
return null;
} else {
volume.setFolder(pool.getPath());
volume.setPath(created.getPath());
@ -775,10 +765,8 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
volume.setPoolId(pool.getId());
volume.setPodId(pod.getId());
volume.setState(Volume.State.Ready);
_volsDao.persist(volume);
return _volsDao.persist(volume);
}
txn.commit();
return volume;
}
public Long chooseHostForStoragePool(StoragePoolVO poolVO, List<Long> avoidHosts, boolean sendToVmResidesOn, Long vmId) {