Updated Branches: refs/heads/master 63494f8df -> d8a235ee3
CLOUDSTACK-2923: Delete Secondary storage of a Zone was giving NPE bcz we were still refering to the object. Instead log that the cpvm and ssvm cant be created bcz sec storage is not available Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d8a235ee Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d8a235ee Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d8a235ee Branch: refs/heads/master Commit: d8a235ee316af7d9b21ea62581c8b5c8925081d8 Parents: 63494f8 Author: Nitin Mehta <[email protected]> Authored: Fri Nov 23 14:11:51 2012 +0530 Committer: Nitin Mehta <[email protected]> Committed: Mon Jun 10 16:48:50 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8a235ee/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 421e53f..7362cf1 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -945,6 +945,13 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy VMTemplateVO template = _templateDao.findSystemVMTemplate(dataCenterId); HostVO secondaryStorageHost = this.templateMgr.getSecondaryStorageHost(dataCenterId); boolean templateReady = false; + + if (secondaryStorageHost == null) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("No secondary storage available in zone " + dataCenterId + ", wait until it is ready to launch secondary storage vm"); + } + return false; + } if (template != null && secondaryStorageHost != null) { VMTemplateHostVO templateHostRef = _vmTemplateHostDao.findByHostTemplate(secondaryStorageHost.getId(), template.getId());
