Merge branch 'investigator_null_state_fix' of https://github.com/remibergsma/cloudstack

Daan Hoogland · Daan Hoogland · commit 97e4fbc294e1 · 2015-04-29T15:00:00.000+02:00
This closes apache#211
diff --git a/server/src/com/cloud/ha/AbstractInvestigatorImpl.java b/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
@@ -92,7 +92,7 @@ protected Status testIpAddress(Long hostId, String testHostIp) {
                 if (s_logger.isDebugEnabled()) {
                     s_logger.debug("host (" + testHostIp + ") returns null answer");
                 }
-                return null;
+                return Status.Alert;
             }
 
             if (pingTestAnswer.getResult()) {
@@ -103,14 +103,20 @@ protected Status testIpAddress(Long hostId, String testHostIp) {
                 return Status.Up;
             } else {
                 if (s_logger.isDebugEnabled()) {
-                    s_logger.debug("host (" + testHostIp + ") cannot be pinged, returning null ('I don't know')");
+                    s_logger.debug("host (" + testHostIp + ") cannot be pinged, returning Alert state");
                 }
-                return null;
+                return Status.Alert;
             }
         } catch (AgentUnavailableException e) {
-            return null;
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug("host (" + testHostIp + "): " + e.getLocalizedMessage() + ", returning Disconnected state");
+            }
+            return Status.Disconnected;
         } catch (OperationTimedoutException e) {
-            return null;
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug("host (" + testHostIp + "): " + e.getLocalizedMessage() + ", returning Alert state");
+            }
+            return Status.Alert;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected Status testIpAddress(Long hostId, String testHostIp) {`
`92`	`92`	`if (s_logger.isDebugEnabled()) {`
`93`	`93`	`s_logger.debug("host (" + testHostIp + ") returns null answer");`
`94`	`94`	`}`
`95`		`- return null;`
	`95`	`+ return Status.Alert;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if (pingTestAnswer.getResult()) {`
`@@ -103,14 +103,20 @@ protected Status testIpAddress(Long hostId, String testHostIp) {`
`103`	`103`	`return Status.Up;`
`104`	`104`	`} else {`
`105`	`105`	`if (s_logger.isDebugEnabled()) {`
`106`		`- s_logger.debug("host (" + testHostIp + ") cannot be pinged, returning null ('I don't know')");`
	`106`	`+ s_logger.debug("host (" + testHostIp + ") cannot be pinged, returning Alert state");`
`107`	`107`	`}`
`108`		`- return null;`
	`108`	`+ return Status.Alert;`
`109`	`109`	`}`
`110`	`110`	`} catch (AgentUnavailableException e) {`
`111`		`- return null;`
	`111`	`+ if (s_logger.isDebugEnabled()) {`
	`112`	`+ s_logger.debug("host (" + testHostIp + "): " + e.getLocalizedMessage() + ", returning Disconnected state");`
	`113`	`+ }`
	`114`	`+ return Status.Disconnected;`
`112`	`115`	`} catch (OperationTimedoutException e) {`
`113`		`- return null;`
	`116`	`+ if (s_logger.isDebugEnabled()) {`
	`117`	`+ s_logger.debug("host (" + testHostIp + "): " + e.getLocalizedMessage() + ", returning Alert state");`
	`118`	`+ }`
	`119`	`+ return Status.Alert;`
`114`	`120`	`}`
`115`	`121`	`}`
`116`	`122`	`}`