Updated Branches: refs/heads/4.0 c3e9fdcc3 -> c02edf9d8
[CLOUDSTACK-359] Hook up the other side of the event propagation Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c02edf9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c02edf9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c02edf9d Branch: refs/heads/4.0 Commit: c02edf9d816dc4937608f005dc06c5c9b4f7e02e Parents: c3e9fdc Author: Hugo Trippaers <[email protected]> Authored: Thu Oct 25 17:59:34 2012 +0200 Committer: Joe Brockmeier <[email protected]> Committed: Thu Nov 15 16:41:01 2012 -0600 ---------------------------------------------------------------------- .../src/com/cloud/cluster/ClusterManagerImpl.java | 17 +++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c02edf9d/server/src/com/cloud/cluster/ClusterManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java index 4dbb16c..f6fdef0 100755 --- a/server/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java @@ -407,6 +407,23 @@ public class ClusterManagerImpl implements ClusterManager { Answer[] answers = new Answer[1]; answers[0] = new Answer(cmd, result, null); return _gson.toJson(answers); + } else if (cmds.length == 1 && cmds[0] instanceof PropagateResourceEventCommand ) { + PropagateResourceEventCommand cmd = (PropagateResourceEventCommand) cmds[0]; + + s_logger.debug("Intercepting command to propagate event " + cmd.getEvent().name() + " for host " + cmd.getHostId()); + + boolean result = false; + try { + result = executeResourceUserRequest(cmd.getHostId(), cmd.getEvent()); + s_logger.debug("Result is " + result); + } catch (AgentUnavailableException ex) { + s_logger.warn("Agent is unavailable", ex); + return null; + } + + Answer[] answers = new Answer[1]; + answers[0] = new Answer(cmd, result, null); + return _gson.toJson(answers); } try {
