cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [1/2] git commit: updated refs/heads/4.2 to 9f9f7d3
Date Mon, 22 Jul 2013 23:15:58 GMT
Updated Branches:
  refs/heads/4.2 c2faa0906 -> 9f9f7d3ff


Remove CLOUDSTACK-3513 debugging messages.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9f9f7d3f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9f9f7d3f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9f9f7d3f

Branch: refs/heads/4.2
Commit: 9f9f7d3ffd364e55fd0f83a8c4382b8739e9b614
Parents: 5ccfc9d
Author: Min Chen <min.chen@citrix.com>
Authored: Mon Jul 22 16:15:20 2013 -0700
Committer: Min Chen <min.chen@citrix.com>
Committed: Mon Jul 22 16:15:45 2013 -0700

----------------------------------------------------------------------
 .../storage/endpoint/DefaultEndPointSelector.java       |  3 ++-
 server/src/com/cloud/agent/manager/AgentAttache.java    | 12 ------------
 .../src/com/cloud/agent/manager/AgentManagerImpl.java   |  4 +---
 3 files changed, 3 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f9f7d3f/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
index bbd6b6e..c3f52ff 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -191,8 +191,9 @@ public class DefaultEndPointSelector implements EndPointSelector {
         // we can arbitrarily pick one ssvm to do that task
         List<HostVO> ssAHosts = listUpAndConnectingSecondaryStorageVmHost(dcId);
         if (ssAHosts == null || ssAHosts.isEmpty()) {
+            s_logger.info("No running ssvm is found, so command will be sent to LocalHostEndPoint");
             return LocalHostEndpoint.getEndpoint(); // use local host as endpoint in
-                                            // case of no ssvm existing
+            // case of no ssvm existing
         }
         Collections.shuffle(ssAHosts);
         HostVO host = ssAHosts.get(0);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f9f7d3f/server/src/com/cloud/agent/manager/AgentAttache.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/AgentAttache.java b/server/src/com/cloud/agent/manager/AgentAttache.java
index 2cedc4d..92ce17b 100755
--- a/server/src/com/cloud/agent/manager/AgentAttache.java
+++ b/server/src/com/cloud/agent/manager/AgentAttache.java
@@ -337,26 +337,14 @@ public abstract class AgentAttache {
         checkAvailability(req.getCommands());
 
         long seq = req.getSequence();
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Request seq: " + seq);
-        }
-
         if (listener != null) {
             registerListener(seq, listener);
         } else if (s_logger.isDebugEnabled()) {
             s_logger.debug(log(seq, "Routed from " + req.getManagementServerId()));
         }
 
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("waiting to send " + seq);
-        }
-
         synchronized(this) {
             try {
-                if (s_logger.isDebugEnabled()) {
-                    s_logger.debug("entering synchronize block for sending " + seq);
-                }
-
                 if (isClosed()) {
                     throw new AgentUnavailableException("The link to the agent has been closed",
_id);
                 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f9f7d3f/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 35b2812..b157838 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -536,9 +536,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager,
Handl
         }
         Request req = new Request(hostId, _nodeId, cmds, commands.stopOnError(), true);
         req.setSequence(agent.getNextSequence());
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("AgentManager sending request");
-        }
+
         agent.send(req, listener);
         return req.getSequence();
     }


Mime
View raw message