CLOUDSTACK-446 : Host going to alert state, if you are adding already added host Adding an already added host fails with error but in the process incorrectly updates the status of the host to 'Alert'. Put a check to prevent this.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0ff6612f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0ff6612f Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0ff6612f Branch: refs/heads/storage_refactor Commit: 0ff6612f7f4c2d876c9201d98faa26e1d583f5b6 Parents: 0221707 Author: Koushik Das <[email protected]> Authored: Tue Nov 6 11:58:30 2012 +0530 Committer: Koushik Das <[email protected]> Committed: Tue Feb 5 19:11:22 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/resource/ResourceManagerImpl.java | 72 ++++++--------- 1 files changed, 27 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0ff6612f/server/src/com/cloud/resource/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index f4fa13b..82013d4 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -1869,11 +1869,29 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return isFirstHost; } + private void markHostAsDisconnected(HostVO host, StartupCommand[] cmds) { + if (host == null) { // in case host is null due to some errors, try reloading the host from db + if (cmds != null) { + StartupCommand firstCmd = cmds[0]; + host = findHostByGuid(firstCmd.getGuid()); + if (host == null) { + host = findHostByGuid(firstCmd.getGuidWithoutResource()); + } + } + } + + if (host != null) { + // Change agent status to Alert, so that host is considered for reconnection next time + _agentMgr.agentStatusTransitTo(host, Status.Event.AgentDisconnected, _nodeId); + } + } + private Host createHostAndAgent(ServerResource resource, Map<String, String> details, boolean old, List<String> hostTags, boolean forRebalance) { HostVO host = null; AgentAttache attache = null; StartupCommand[] cmds = null; + boolean hostExists = false; try { cmds = resource.initialize(); @@ -1902,10 +1920,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, if (host == null) { host = findHostByGuid(firstCmd.getGuidWithoutResource()); } - if (host != null && host.getRemoved() == null) { - s_logger.debug("Found the host " + host.getId() - + " by guid: " + firstCmd.getGuid() - + ", old host reconnected as new"); + if (host != null && host.getRemoved() == null) { // host already added, no need to add again + s_logger.debug("Found the host " + host.getId() + " by guid: " + firstCmd.getGuid() + ", old host reconnected as new"); + hostExists = true; // ensures that host status is left unchanged in case of adding same one again return null; } } @@ -1925,35 +1942,16 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } catch (Exception e) { s_logger.warn("Unable to connect due to ", e); } finally { - if (attache == null) { + if (hostExists) { if (cmds != null) { resource.disconnected(); } - // In case of some db errors, we may land with the sitaution - // that host is null. We need to reload host from db and call - // disconnect on it so that it will be loaded for reconnection - // next time - HostVO tempHost = host; - if (tempHost == null) { + } else { + if (attache == null) { if (cmds != null) { - StartupCommand firstCmd = cmds[0]; - tempHost = findHostByGuid(firstCmd.getGuid()); - if (tempHost == null) { - tempHost = findHostByGuid(firstCmd - .getGuidWithoutResource()); - } + resource.disconnected(); } - } - - if (tempHost != null) { - /* Change agent status to Alert */ - _agentMgr.agentStatusTransitTo(tempHost, - Status.Event.AgentDisconnected, _nodeId); - /* - * Don't change resource state here since HostVO is already - * in database, which means resource state has had an - * appropriate value - */ + markHostAsDisconnected(host, cmds); } } } @@ -2060,23 +2058,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, if (cmds != null) { resource.disconnected(); } - - // In case of some db errors, we may land with the situation that host is null. We need to reload host from db and call disconnect on it so that it will be loaded for reconnection next time - HostVO tempHost = host; - if (tempHost == null) { - if (cmds != null) { - StartupCommand firstCmd = cmds[0]; - tempHost = findHostByGuid(firstCmd.getGuid()); - if (tempHost == null) { - tempHost = findHostByGuid(firstCmd.getGuidWithoutResource()); - } - } - } - if (tempHost != null) { - /* Change agent status to Alert */ - _agentMgr.agentStatusTransitTo(tempHost, Status.Event.AgentDisconnected, _nodeId); - /* Don't change resource state here since HostVO is already in database, which means resource state has had an appropriate value*/ - } + markHostAsDisconnected(host, cmds); } } }
