You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/04/29 15:05:55 UTC
git commit: updated refs/heads/4.5 to f8b7251
Repository: cloudstack
Updated Branches:
refs/heads/4.5 e02d787f3 -> f8b7251b8
return a state instead of null
When a full cluster is down or unreachable,
CloudStack currently reports everything the
same as the last known state, which is usually
Up. When it cannot reach a host and cannot
reach another host in the same cluster either,
it returns null and says "I don't know". This
prevents it from reporting the problem. Now,
we return an Alert or Disconnected state so
proper action can be taken.
Also logging was added, so we know what part
of the code put it to Alert or Disconnected.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f8b7251b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f8b7251b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f8b7251b
Branch: refs/heads/4.5
Commit: f8b7251b8827147559f8203fd75765bf3bd4a045
Parents: e02d787
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Apr 29 14:14:14 2015 -0400
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Apr 29 15:05:02 2015 +0200
----------------------------------------------------------------------
.../src/com/cloud/ha/AbstractInvestigatorImpl.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f8b7251b/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/AbstractInvestigatorImpl.java b/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
index bb37c05..b222386 100755
--- a/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
+++ b/server/src/com/cloud/ha/AbstractInvestigatorImpl.java
@@ -92,7 +92,7 @@ public abstract class AbstractInvestigatorImpl extends AdapterBase implements In
if (s_logger.isDebugEnabled()) {
s_logger.debug("host (" + testHostIp + ") returns null answer");
}
- return null;
+ return Status.Alert;
}
if (pingTestAnswer.getResult()) {
@@ -103,14 +103,20 @@ public abstract class AbstractInvestigatorImpl extends AdapterBase implements In
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;
}
}
}