Updated Branches: refs/heads/object_store 0a976d5fd -> 5b76e4914
Remove sendToSecStorage methods from agentManager to use EndPoint instead. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b76e491 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b76e491 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b76e491 Branch: refs/heads/object_store Commit: 5b76e4914c760d046224d21fa9876b147c9f6e62 Parents: 0a976d5 Author: Min Chen <[email protected]> Authored: Wed Apr 24 16:21:41 2013 -0700 Committer: Min Chen <[email protected]> Committed: Wed Apr 24 16:21:41 2013 -0700 ---------------------------------------------------------------------- .../storage/test/DirectAgentManagerSimpleImpl.java | 12 ------- server/src/com/cloud/agent/AgentManager.java | 4 -- .../com/cloud/agent/manager/AgentManagerImpl.java | 26 --------------- .../test/com/cloud/agent/MockAgentManagerImpl.java | 10 ------ 4 files changed, 0 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b76e491/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java index 220a7b0..6941ff8 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java @@ -175,18 +175,6 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa return null; } - @Override - public void sendToSecStorage(HostVO ssHost, Command cmd, Listener listener) throws AgentUnavailableException { - // TODO Auto-generated method stub - - } - - @Override - public Answer sendToSecStorage(HostVO ssHost, Command cmd) { - // TODO Auto-generated method stub - return null; - } - @Override public boolean tapLoadingAgents(Long hostId, TapAgentsAction action) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b76e491/server/src/com/cloud/agent/AgentManager.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/agent/AgentManager.java b/server/src/com/cloud/agent/AgentManager.java index e4d5597..02dd10d 100755 --- a/server/src/com/cloud/agent/AgentManager.java +++ b/server/src/com/cloud/agent/AgentManager.java @@ -137,10 +137,6 @@ public interface AgentManager extends Manager { Answer sendTo(Long dcId, HypervisorType type, Command cmd); - void sendToSecStorage(HostVO ssHost, Command cmd, Listener listener) throws AgentUnavailableException; - - Answer sendToSecStorage(HostVO ssHost, Command cmd); - /* working as a lock while agent is being loaded */ public boolean tapLoadingAgents(Long hostId, TapAgentsAction action); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b76e491/server/src/com/cloud/agent/manager/AgentManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index a32e010..fb857a7 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -377,32 +377,6 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl } - @Override - public Answer sendToSecStorage(HostVO ssHost, Command cmd) { - if( ssHost.getType() == Host.Type.LocalSecondaryStorage ) { - return easySend(ssHost.getId(), cmd); - } else if ( ssHost.getType() == Host.Type.SecondaryStorage) { - return sendToSSVM(ssHost.getDataCenterId(), cmd); - } else { - String msg = "do not support Secondary Storage type " + ssHost.getType(); - s_logger.warn(msg); - return new Answer(cmd, false, msg); - } - } - - @Override - public void sendToSecStorage(HostVO ssHost, Command cmd, Listener listener) throws AgentUnavailableException { - if( ssHost.getType() == Host.Type.LocalSecondaryStorage ) { - send(ssHost.getId(), new Commands(cmd), listener); - } else if ( ssHost.getType() == Host.Type.SecondaryStorage) { - sendToSSVM(ssHost.getDataCenterId(), cmd, listener); - } else { - String err = "do not support Secondary Storage type " + ssHost.getType(); - s_logger.warn(err); - throw new CloudRuntimeException(err); - } - } - private void sendToSSVM(final long dcId, final Command cmd, final Listener listener) throws AgentUnavailableException { List<HostVO> ssAHosts = _ssvmMgr.listUpAndConnectingSecondaryStorageVmHost(dcId); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b76e491/server/test/com/cloud/agent/MockAgentManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/agent/MockAgentManagerImpl.java b/server/test/com/cloud/agent/MockAgentManagerImpl.java index 3ebb549..01f4e9c 100755 --- a/server/test/com/cloud/agent/MockAgentManagerImpl.java +++ b/server/test/com/cloud/agent/MockAgentManagerImpl.java @@ -131,16 +131,6 @@ public class MockAgentManagerImpl extends ManagerBase implements AgentManager { return null; } - @Override - public void sendToSecStorage(HostVO ssHost, Command cmd, Listener listener) { - } - - @Override - public Answer sendToSecStorage(HostVO ssHost, Command cmd) { - // TODO Auto-generated method stub - return null; - } - @Override public boolean tapLoadingAgents(Long hostId, TapAgentsAction action) {
