From 2868d4b3369b7d31047b1baf699765232cb99403 Mon Sep 17 00:00:00 2001 From: Harikrishna Patnala Date: Sat, 10 Aug 2013 16:49:09 +0530 Subject: [PATCH] CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm; Zone host is ready, but secondary storage vm template: 3 is not ready on secondary storage: 2 Signed-off-by: Abhinandan Prateek --- server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 2 +- .../cloud/storage/secondary/SecondaryStorageManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 3ce7acfbacf..fd282592149 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -950,7 +950,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy public boolean isZoneReady(Map zoneHostInfoMap, long dataCenterId) { ZoneHostInfo zoneHostInfo = zoneHostInfoMap.get(dataCenterId); if (zoneHostInfo != null && isZoneHostReady(zoneHostInfo)) { - VMTemplateVO template = _templateDao.findSystemVMTemplate(dataCenterId); + VMTemplateVO template = _templateDao.findSystemVMReadyTemplate(dataCenterId, HypervisorType.Any); TemplateDataStoreVO templateHostRef = _vmTemplateStoreDao.findByTemplateZoneDownloadStatus(template.getId(), dataCenterId, Status.DOWNLOADED); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 9e172d35979..a19dc591185 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -720,7 +720,7 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar public boolean isZoneReady(Map zoneHostInfoMap, long dataCenterId) { ZoneHostInfo zoneHostInfo = zoneHostInfoMap.get(dataCenterId); if (zoneHostInfo != null && (zoneHostInfo.getFlags() & RunningHostInfoAgregator.ZoneHostInfo.ROUTING_HOST_MASK) != 0) { - VMTemplateVO template = _templateDao.findSystemVMTemplate(dataCenterId); + VMTemplateVO template = _templateDao.findSystemVMReadyTemplate(dataCenterId, HypervisorType.Any); if (template == null) { s_logger.debug("No hypervisor host added in zone " + dataCenterId + ", wait until it is ready to launch secondary storage vm"); return false;