apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1881 from Accelerite/CLOUDSTACK-9721

Browse Source 
CLOUDSTACK-9721: Remove deprecated/unused global configuration parameter - consoleproxy.loadscan.interval

* pr/1881:
  CLOUDSTACK-9721: Remove deprecated/unused global configuration parameter - consoleproxy.loadscan.interval

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
This commit is contained in:
Rajani Karuturi 2017-02-21 17:30:30 +05:30
commit fe555e194e
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/configuration/Config.java
View File

@ -439,14 +439,6 @@ public enum Config {
null), null),
ConsoleProxyRestart("Console Proxy", AgentManager.class, Boolean.class, "consoleproxy.restart", "true", "Console proxy restart flag, defaulted to true", null), ConsoleProxyRestart("Console Proxy", AgentManager.class, Boolean.class, "consoleproxy.restart", "true", "Console proxy restart flag, defaulted to true", null),
ConsoleProxyUrlDomain("Console Proxy", AgentManager.class, String.class, "consoleproxy.url.domain", "", "Console proxy url domain", "domainName"), ConsoleProxyUrlDomain("Console Proxy", AgentManager.class, String.class, "consoleproxy.url.domain", "", "Console proxy url domain", "domainName"),
ConsoleProxyLoadscanInterval(
"Console Proxy",
AgentManager.class,
String.class,
"consoleproxy.loadscan.interval",
"10000",
"The time interval(in milliseconds) to scan console proxy working-load info",
null),
ConsoleProxySessionMax( ConsoleProxySessionMax(
"Console Proxy", "Console Proxy",
AgentManager.class, AgentManager.class,

1
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -381,7 +381,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
configValuesForValidation.add("account.cleanup.interval"); configValuesForValidation.add("account.cleanup.interval");
configValuesForValidation.add("alert.wait"); configValuesForValidation.add("alert.wait");
configValuesForValidation.add("consoleproxy.capacityscan.interval"); configValuesForValidation.add("consoleproxy.capacityscan.interval");
configValuesForValidation.add("consoleproxy.loadscan.interval");
configValuesForValidation.add("expunge.interval"); configValuesForValidation.add("expunge.interval");
configValuesForValidation.add("host.stats.interval"); configValuesForValidation.add("host.stats.interval");
configValuesForValidation.add("investigate.retry.interval"); configValuesForValidation.add("investigate.retry.interval");

2
server/src/com/cloud/test/DatabaseConfig.java
View File

@ -193,7 +193,6 @@ public class DatabaseConfig {
s_configurationDescriptions.put("consoleproxy.url.port", "Console proxy port for AJAX viewer"); s_configurationDescriptions.put("consoleproxy.url.port", "Console proxy port for AJAX viewer");
s_configurationDescriptions.put("consoleproxy.ram.size", "RAM size (in MB) used to create new console proxy VMs"); s_configurationDescriptions.put("consoleproxy.ram.size", "RAM size (in MB) used to create new console proxy VMs");
s_configurationDescriptions.put("consoleproxy.cmd.port", "Console proxy command port that is used to communicate with management server"); s_configurationDescriptions.put("consoleproxy.cmd.port", "Console proxy command port that is used to communicate with management server");
s_configurationDescriptions.put("consoleproxy.loadscan.interval", "The time interval(in milliseconds) to scan console proxy working-load info");
s_configurationDescriptions.put("consoleproxy.capacityscan.interval", s_configurationDescriptions.put("consoleproxy.capacityscan.interval",
"The time interval(in millisecond) to scan whether or not system needs more console proxy to ensure minimal standby capacity"); "The time interval(in millisecond) to scan whether or not system needs more console proxy to ensure minimal standby capacity");
s_configurationDescriptions.put("consoleproxy.capacity.standby", s_configurationDescriptions.put("consoleproxy.capacity.standby",
@ -283,7 +282,6 @@ public class DatabaseConfig {
s_configurationComponents.put("guest.domain.suffix", "AgentManager"); s_configurationComponents.put("guest.domain.suffix", "AgentManager");
s_configurationComponents.put("consoleproxy.ram.size", "AgentManager"); s_configurationComponents.put("consoleproxy.ram.size", "AgentManager");
s_configurationComponents.put("consoleproxy.cmd.port", "AgentManager"); s_configurationComponents.put("consoleproxy.cmd.port", "AgentManager");
s_configurationComponents.put("consoleproxy.loadscan.interval", "AgentManager");
s_configurationComponents.put("consoleproxy.capacityscan.interval", "AgentManager"); s_configurationComponents.put("consoleproxy.capacityscan.interval", "AgentManager");
s_configurationComponents.put("consoleproxy.capacity.standby", "AgentManager"); s_configurationComponents.put("consoleproxy.capacity.standby", "AgentManager");
s_configurationComponents.put("consoleproxy.session.max", "AgentManager"); s_configurationComponents.put("consoleproxy.session.max", "AgentManager");

2
setup/db/db/schema-4920to41000-cleanup.sql
View File

@ -18,3 +18,5 @@
--; --;
-- Schema upgrade cleanup from 4.9.2.0 to 4.10.0.0; -- Schema upgrade cleanup from 4.9.2.0 to 4.10.0.0;
--; --;
DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.loadscan.interval';