cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/4.2 to 97b8f12
Date Mon, 12 Aug 2013 03:04:29 GMT
Updated Branches:
  refs/heads/4.2 d67b4d085 -> 97b8f123a


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 <aprateek@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97b8f123
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97b8f123
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97b8f123

Branch: refs/heads/4.2
Commit: 97b8f123a0e75b7ccfa01f3790062bfc25d17d98
Parents: d67b4d0
Author: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Authored: Sat Aug 10 16:36:26 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Mon Aug 12 08:19:37 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java     | 2 +-
 .../com/cloud/storage/secondary/SecondaryStorageManagerImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97b8f123/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index c5c0c0c..3d58731 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -938,7 +938,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
     public boolean isZoneReady(Map<Long, ZoneHostInfo> 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 = this._vmTemplateStoreDao.findByTemplateZoneDownloadStatus(template.getId(),
dataCenterId,
                     Status.DOWNLOADED);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97b8f123/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index 3c1165b..c417068 100755
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
@@ -723,7 +723,7 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements
Secondar
     public boolean isZoneReady(Map<Long, ZoneHostInfo> 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;


Mime
View raw message