From da7148a13ed033421b2894684ff0ec34f31cb02b Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Fri, 30 Dec 2016 03:32:27 +0530 Subject: [PATCH] CLOUDSTACK-9721: Remove deprecated/unused global configuration parameter - consoleproxy.loadscan.interval --- server/src/com/cloud/configuration/Config.java | 8 -------- .../com/cloud/configuration/ConfigurationManagerImpl.java | 1 - server/src/com/cloud/test/DatabaseConfig.java | 2 -- setup/db/db/schema-4920to41000-cleanup.sql | 2 ++ 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 851b868c2d8..c0c233829af 100644 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -439,14 +439,6 @@ public enum Config { 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"), - 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( "Console Proxy", AgentManager.class, diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 10136c6bf32..09c7ec0789c 100644 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -381,7 +381,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati configValuesForValidation.add("account.cleanup.interval"); configValuesForValidation.add("alert.wait"); configValuesForValidation.add("consoleproxy.capacityscan.interval"); - configValuesForValidation.add("consoleproxy.loadscan.interval"); configValuesForValidation.add("expunge.interval"); configValuesForValidation.add("host.stats.interval"); configValuesForValidation.add("investigate.retry.interval"); diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java index 13dab554488..a27f6710631 100644 --- a/server/src/com/cloud/test/DatabaseConfig.java +++ b/server/src/com/cloud/test/DatabaseConfig.java @@ -193,7 +193,6 @@ public class DatabaseConfig { 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.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", "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", @@ -283,7 +282,6 @@ public class DatabaseConfig { s_configurationComponents.put("guest.domain.suffix", "AgentManager"); s_configurationComponents.put("consoleproxy.ram.size", "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.capacity.standby", "AgentManager"); s_configurationComponents.put("consoleproxy.session.max", "AgentManager"); diff --git a/setup/db/db/schema-4920to41000-cleanup.sql b/setup/db/db/schema-4920to41000-cleanup.sql index 6a4707831db..66070652b5b 100644 --- a/setup/db/db/schema-4920to41000-cleanup.sql +++ b/setup/db/db/schema-4920to41000-cleanup.sql @@ -18,3 +18,5 @@ --; -- Schema upgrade cleanup from 4.9.2.0 to 4.10.0.0; --; + +DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.loadscan.interval'; \ No newline at end of file