Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D570A10FAF for ; Fri, 14 Mar 2014 13:58:27 +0000 (UTC) Received: (qmail 5430 invoked by uid 500); 14 Mar 2014 13:58:27 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 5172 invoked by uid 500); 14 Mar 2014 13:58:26 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 406 invoked by uid 99); 14 Mar 2014 13:58:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Mar 2014 13:58:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 72F83981A02; Fri, 14 Mar 2014 13:57:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hugo@apache.org To: commits@cloudstack.apache.org Date: Fri, 14 Mar 2014 13:58:20 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [23/50] [abbrv] git commit: updated refs/heads/4.4 to 48f8a95 HA manager to check target state of the VM to make decisions on whether or not to carry on a cheduled step. Fix NPE in capacity manager when releasing capacity of a stopped VM. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4312d884 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4312d884 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4312d884 Branch: refs/heads/4.4 Commit: 4312d884629d4a9e7716da4c869433cdaa8181b8 Parents: 3d5fbe7 Author: Kelven Yang Authored: Tue Mar 4 16:43:26 2014 -0800 Committer: Kelven Yang Committed: Thu Mar 13 16:59:56 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/capacity/CapacityManagerImpl.java | 5 +++++ server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 2 ++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4312d884/server/src/com/cloud/capacity/CapacityManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java index 957a5d0..69e8cfa 100755 --- a/server/src/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java @@ -188,6 +188,11 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager, Long clusterId = null; if (hostId != null) { HostVO host = _hostDao.findById(hostId); + if (host == null) { + s_logger.warn("Host " + hostId + " no long exist anymore!"); + return true; + } + clusterId = host.getClusterId(); } if (capacityCpu == null || capacityMemory == null || svo == null) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4312d884/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index 3bcaf2e..8bd569a 100755 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -701,6 +701,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai (vm.getHostId() != null ? vm.getHostId() : "none") + " State: " + vm.getState()); return null; } + _itMgr.advanceStop(vm.getUuid(), false); s_logger.info("Stop for " + vm + " was successful"); return null; @@ -711,6 +712,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements HighAvai (vm.getHostId() != null ? vm.getHostId() : "none") + " State: " + vm.getState()); return null; } + _itMgr.advanceStop(vm.getUuid(), true); s_logger.info("Stop for " + vm + " was successful"); return null;