Updated Branches: refs/heads/master 8c19caebf -> 9059740dc
HA worker thread needs to have its own worker thread configuration Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9059740d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9059740d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9059740d Branch: refs/heads/master Commit: 9059740dc10a850afc4b50e036586f726b5a52d9 Parents: 8c19cae Author: Edison Su <[email protected]> Authored: Fri Aug 17 12:54:02 2012 -0700 Committer: Edison Su <[email protected]> Committed: Fri Aug 17 12:59:52 2012 -0700 ---------------------------------------------------------------------- server/src/com/cloud/configuration/Config.java | 1 + .../com/cloud/ha/HighAvailabilityManagerImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9059740d/server/src/com/cloud/configuration/Config.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 5ee66ff..6537c9b 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -178,6 +178,7 @@ public enum Config { XapiWait("Advanced", AgentManager.class, Integer.class, "xapiwait", "600", "Time (in seconds) to wait for XAPI to return", null), MigrateWait("Advanced", AgentManager.class, Integer.class, "migratewait", "3600", "Time (in seconds) to wait for VM migrate finish", null), Workers("Advanced", AgentManager.class, Integer.class, "workers", "5", "Number of worker threads.", null), + HAWorkers("Advanced", AgentManager.class, Integer.class, "ha.workers", "5", "Number of ha worker threads.", null), MountParent("Advanced", ManagementServer.class, String.class, "mount.parent", "/var/lib/cloud/management/mnt", "The mount point on the Management Server for Secondary Storage.", null), // UpgradeURL("Advanced", ManagementServer.class, String.class, "upgrade.url", "http://example.com:8080/client/agent/update.zip";, "The upgrade URL is the URL of the management server that agents will connect to in order to automatically upgrade.", null), SystemVMUseLocalStorage("Advanced", ManagementServer.class, Boolean.class, "system.vm.use.local.storage", "false", "Indicates whether to use local storage pools or shared storage pools for system VMs.", null), http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9059740d/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java index 87743d5..b91e47d 100755 --- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -37,6 +37,7 @@ import com.cloud.alert.AlertManager; import com.cloud.cluster.ClusterManagerListener; import com.cloud.cluster.ManagementServerHostVO; import com.cloud.cluster.StackMaid; +import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.DataCenterVO; @@ -703,7 +704,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager, Clu params = configDao.getConfiguration(Long.toHexString(_serverId), xmlParams); } - String value = params.get("workers"); + String value = params.get(Config.HAWorkers.key()); final int count = NumbersUtil.parseInt(value, 1); _workers = new WorkerThread[count]; for (int i = 0; i < _workers.length; i++) {
