diff --git a/.project b/.project deleted file mode 100644 index 183860bd142..00000000000 --- a/.project +++ /dev/null @@ -1,24 +0,0 @@ - - - mgit - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - - - src - 2 - /Users/john1/mgit/cloudbridge/src - - - diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java index 56e9bccf9f4..4c7d4f28c1e 100755 --- a/server/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java @@ -399,6 +399,23 @@ public class ClusterManagerImpl implements ClusterManager { s_logger.warn("Operation timed out", e); return null; } + 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]; + if (s_logger.isDebugEnabled()) { + s_logger.debug("Intercepting resource manager command: " + _gson.toJson(cmd)); + } + + boolean result = false; + try { + result = _resourceMgr.executeUserRequest(cmd.getHostId(), cmd.getEvent()); + } catch (Exception e) { + s_logger.warn("Exception happened while exceuting command from resource manager in other mgmt server", e); + return null; + } + Answer[] answers = new Answer[1]; answers[0] = new Answer(cmd, result, null); return _gson.toJson(answers);