From c36880fe457ddb6364323cfbc27183aac5c18bb4 Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Wed, 22 Aug 2012 14:13:19 +0530 Subject: [PATCH] CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed. Reviewed-by: prachi --- server/src/com/cloud/resource/ResourceManagerImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index d33dc2de7df..5adb4ec7a6f 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -1695,6 +1695,15 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma if (cmds != null) { resource.disconnected(); } + if(host == null){ + 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 */