From d466ecaf7a05a6c5ecdc8ef61aff34c930bc12d4 Mon Sep 17 00:00:00 2001 From: Likitha Shetty Date: Tue, 6 Jan 2015 15:33:47 +0530 Subject: [PATCH] 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'. (cherry picked from commit bc235ed5eb0f88c3c62542a3e06bdc28c7b49eac) Signed-off-by: Rohit Yadav --- agent/src/com/cloud/agent/AgentShell.java | 3 +++ .../secondarystorage/SecondaryStorageManagerImpl.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java index 67b7b2fa4ad..78430aee0b5 100644 --- a/agent/src/com/cloud/agent/AgentShell.java +++ b/agent/src/com/cloud/agent/AgentShell.java @@ -236,6 +236,9 @@ public class AgentShell implements IAgentShell, Daemon { } _workers = NumberUtils.toInt(workers, 5); + if (_workers <= 0) { + _workers = 5; + } if (host == null) { host = getProperty(null, "host"); 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 cc7eb253bb0..e8857f16a00 100755 --- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java @@ -1051,6 +1051,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");