Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions server/src/com/cloud/configuration/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@ private void populateConfigValuesForValidationSet() {
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");
Expand Down
2 changes: 0 additions & 2 deletions server/src/com/cloud/test/DatabaseConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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");
Expand Down
2 changes: 2 additions & 0 deletions setup/db/db/schema-4920to41000-cleanup.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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';