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

bug 7149: merge from 2.1.x

This commit is contained in:
anthony 2010-11-12 13:15:32 -08:00
parent ad5da6c633
commit 2537dc3058
6 changed files with 46 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -614,13 +614,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
DataCenterVO dc = _dcDao.findById(proxy.getDataCenterId());
HostPodVO pod = _podDao.findById(proxy.getPodId());
List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(proxy.getId());
if(sps.size() < 1) {
s_logger.info("Storage pool is not ready for console proxy: " + proxy.getId());
return null;
}
StoragePoolVO sp = sps.get(0); // FIXME
StoragePoolVO sp = _storageMgr.getStoragePoolForVm(proxy.getId());
HashSet<Host> avoid = new HashSet<Host>();
HostVO routingHost = (HostVO) _agentMgr.findHost(Host.Type.Routing, dc, pod, sp, _serviceOffering, _template, proxy, null, avoid);
@ -2170,8 +2164,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
boolean mirroredVols = proxy.isMirroredVols();
DataCenterVO dc = _dcDao.findById(proxy.getDataCenterId());
HostPodVO pod = _podDao.findById(proxy.getPodId());
List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(proxy.getId());
StoragePoolVO sp = sps.get(0); // FIXME
StoragePoolVO sp = _storageMgr.getStoragePoolForVm(proxy.getId());
List<VolumeVO> vols = _volsDao.findCreatedByInstance(routerId);

6
server/src/com/cloud/network/router/DomainRouterManagerImpl.java
View File

@ -837,8 +837,7 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute
final VMTemplateVO template = _templateDao.findById(router.getTemplateId());
final DataCenterVO dc = _dcDao.findById(router.getDataCenterId());
ServiceOfferingVO offering = _serviceOfferingDao.findById(router.getServiceOfferingId());
List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(router.getId());
StoragePoolVO sp = sps.get(0); // FIXME
StoragePoolVO sp = _storageMgr.getStoragePoolForVm(router.getId());
HostVO routingHost = (HostVO)_agentMgr.findHost(Host.Type.Routing, dc, pod, sp, offering, template, router, null, avoid);
@ -1738,8 +1737,7 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute
final DataCenterVO dc = _dcDao.findById(router.getDataCenterId());
final HostPodVO pod = _podDao.findById(router.getPodId());
final ServiceOfferingVO offering = _serviceOfferingDao.findById(router.getServiceOfferingId());
List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(router.getId());
StoragePoolVO sp = sps.get(0); // FIXME
StoragePoolVO sp = _storageMgr.getStoragePoolForVm(router.getId());
final List<VolumeVO> vols = _volsDao.findCreatedByInstance(routerId);

2
server/src/com/cloud/storage/StorageManager.java
View File

@ -304,7 +304,7 @@ public interface StorageManager extends Manager {
* @param vmId id of the vm.
* @return List of StoragePoolVO
*/
List<StoragePoolVO> getStoragePoolsForVm(long vmId);
StoragePoolVO getStoragePoolForVm(long vmId);
String getPrimaryStorageNameLabel(VolumeVO volume);

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

@ -728,28 +728,22 @@ public class StorageManagerImpl implements StorageManager {
dskCh.setHyperType(hyperType);
Transaction txn = Transaction.currentTxn();
VolumeTO created = null;
int retry = _retry;
while (--retry >= 0) {
created = null;
txn.start();
long podId = pod.getId();
pod = _podDao.lockRow(podId, true);
pod = _podDao.findById(podId);
if (pod == null) {
txn.rollback();
volume.setStatus(AsyncInstanceCreateStatus.Failed);
volume.setDestroyed(true);
_volsDao.persist(volume);
throw new CloudRuntimeException("Unable to acquire lock on the pod " + podId);
s_logger.warn("Unable to find pod " + podId + " when create volume " + volume.getName());
break;
}
pool = findStoragePool(dskCh, dc, pod, clusterId, offering, vm, template, avoidPools);
if (pool == null) {
txn.rollback();
s_logger.warn("Unable to find storage poll when create volume " + volume.getName());
break;
}
@ -758,11 +752,6 @@ public class StorageManagerImpl implements StorageManager {
s_logger.debug("Trying to create " + volume + " on " + pool);
}
volume.setPoolId(pool.getId());
_volsDao.persist(volume);
txn.commit();
CreateCommand cmd = null;
VMTemplateStoragePoolVO tmpltStoredOn = null;
if (volume.getVolumeType() == VolumeType.ROOT && Storage.ImageFormat.ISO != template.getFormat()) {
@ -780,13 +769,12 @@ public class StorageManagerImpl implements StorageManager {
created = ((CreateAnswer)answer).getVolume();
break;
}
volume.setPoolId(null);
_volsDao.persist(volume);
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);
@ -794,18 +782,20 @@ public class StorageManagerImpl implements StorageManager {
volume.setStatus(AsyncInstanceCreateStatus.Failed);
volume.setDestroyed(true);
_volsDao.persist(volume);
_volsDao.remove(volume.getId());
volume = null;
return null;
} else {
volume.setStatus(AsyncInstanceCreateStatus.Created);
volume.setFolder(pool.getPath());
volume.setPath(created.getPath());
volume.setSize(created.getSize());
volume.setPoolType(pool.getPoolType());
volume.setPoolId(pool.getId());
volume.setPodId(pod.getId());
_volsDao.persist(volume);
}
volume.setStatus(AsyncInstanceCreateStatus.Created);
volume.setFolder(pool.getPath());
volume.setPath(created.getPath());
volume.setSize(created.getSize());
volume.setPoolType(pool.getPoolType());
volume.setPodId(pod.getId());
volume.setState(Volume.State.Ready);
_volsDao.persist(volume);
txn.commit();
return volume;
}
@ -1087,6 +1077,7 @@ public class StorageManagerImpl implements StorageManager {
SearchBuilder<VolumeVO> volSearch = _volsDao.createSearchBuilder();
PoolsUsedByVmSearch.join("volumes", volSearch, volSearch.entity().getPoolId(), PoolsUsedByVmSearch.entity().getId(), JoinBuilder.JoinType.INNER);
volSearch.and("vm", volSearch.entity().getInstanceId(), SearchCriteria.Op.EQ);
volSearch.and("status", volSearch.entity().getStatus(), SearchCriteria.Op.EQ);
volSearch.done();
PoolsUsedByVmSearch.done();
@ -2137,11 +2128,24 @@ public class StorageManagerImpl implements StorageManager {
}
@Override
public List<StoragePoolVO> getStoragePoolsForVm(long vmId) {
public StoragePoolVO getStoragePoolForVm(long vmId) {
SearchCriteria<StoragePoolVO> sc = PoolsUsedByVmSearch.create();
sc.setJoinParameters("volumes", "vm", vmId);
return _storagePoolDao.search(sc, null);
sc.setJoinParameters("volumes", "status", AsyncInstanceCreateStatus.Created.toString());
List<StoragePoolVO> sps= _storagePoolDao.search(sc, null);
if( sps.size() == 0 ) {
throw new RuntimeException("Volume is not created for VM " + vmId);
}
StoragePoolVO sp = sps.get(0);
for (StoragePoolVO tsp: sps ) {
// use the local storage pool to choose host,
// shared storage pool should be in the same cluster as local storage pool
if( tsp.isLocal()) {
sp = tsp;
break;
}
}
return sp;
}
@Override

8
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
View File

@ -348,8 +348,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
DataCenterVO dc = _dcDao.findById(secStorageVm.getDataCenterId());
HostPodVO pod = _podDao.findById(secStorageVm.getPodId());
List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(secStorageVm.getId());
StoragePoolVO sp = sps.get(0); // FIXME
StoragePoolVO sp = _storageMgr.getStoragePoolForVm(secStorageVm.getId());
HashSet<Host> avoid = new HashSet<Host>();
HostVO routingHost = (HostVO) _agentMgr.findHost(Host.Type.Routing, dc, pod, sp, _serviceOffering, _template, secStorageVm, null, avoid);
@ -1886,9 +1885,8 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V
boolean mirroredVols = secStorageVm.isMirroredVols();
DataCenterVO dc = _dcDao.findById(secStorageVm.getDataCenterId());
HostPodVO pod = _podDao.findById(secStorageVm.getPodId());
List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(secStorageVm.getId());
StoragePoolVO sp = sps.get(0); // FIXME
StoragePoolVO sp = _storageMgr.getStoragePoolForVm(secStorageVm.getId());
List<VolumeVO> vols = _volsDao.findCreatedByInstance(routerId);
String[] storageIps = new String[2];

7
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -862,8 +862,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM
DataCenterVO dc = _dcDao.findById(vm.getDataCenterId());
HostPodVO pod = _podDao.findById(vm.getPodId());
List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(vm.getId());
StoragePoolVO sp = sps.get(0); // FIXME
StoragePoolVO sp = _storageMgr.getStoragePoolForVm(vm.getId());
VMTemplateVO template = _templateDao.findById(vm.getTemplateId());
ServiceOffering offering = _offeringDao.findById(vm.getServiceOfferingId());
@ -2263,9 +2262,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM
HostPodVO pod = _podDao.findById(vm.getPodId());
ServiceOfferingVO offering = _offeringDao.findById(vm.getServiceOfferingId());
VMTemplateVO template = _templateDao.findById(vm.getTemplateId());
List<StoragePoolVO> sps = _storageMgr.getStoragePoolsForVm(vm.getId());
StoragePoolVO sp = sps.get(0); // FIXME
StoragePoolVO sp = _storageMgr.getStoragePoolForVm(vm.getId());
List<VolumeVO> vols = _volsDao.findCreatedByInstance(vmId);