cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/master to bc235ed
Date Wed, 07 Jan 2015 04:32:54 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 3cba1c41f -> bc235ed5e


CLOUDSTACK-5485. Cannot process more than 5 concurrent snapshots.
Number of threads on SSVM agent for connection with MS (Agent->NioClient) should be configurable
using global config 'workers'.


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

Branch: refs/heads/master
Commit: bc235ed5eb0f88c3c62542a3e06bdc28c7b49eac
Parents: 3cba1c4
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Tue Jan 6 15:33:47 2015 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Wed Jan 7 09:41:24 2015 +0530

----------------------------------------------------------------------
 agent/src/com/cloud/agent/AgentShell.java                         | 3 +++
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java  | 2 ++
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc235ed5/agent/src/com/cloud/agent/AgentShell.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java
index 34e73ed..7f83476 100644
--- a/agent/src/com/cloud/agent/AgentShell.java
+++ b/agent/src/com/cloud/agent/AgentShell.java
@@ -229,6 +229,9 @@ public class AgentShell implements IAgentShell, Daemon {
         }
 
         _workers = NumberUtils.toInt(workers, 5);
+        if (_workers <= 0) {
+            _workers = 5;
+        }
 
         if (host == null) {
             host = getProperty(null, "host");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc235ed5/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index ccf3dcd..9883932 100644
--- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -1052,6 +1052,8 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements
Secondar
 
         buf.append(" guid=").append(profile.getVirtualMachine().getHostName());
 
+        buf.append(" workers=").append(_configDao.getValue("workers"));
+
         if (_configDao.isPremium()) {
             s_logger.debug("VmWare hypervisor configured, telling the ssvm to load the PremiumSecondaryStorageResource");
             buf.append(" resource=com.cloud.storage.resource.PremiumSecondaryStorageResource");


Mime
View raw message