You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/21 12:02:34 UTC

[1/4] git commit: updated refs/heads/master to 50147a4

Repository: cloudstack
Updated Branches:
  refs/heads/master 987be62b2 -> 50147a420


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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/da7148a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/da7148a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/da7148a1

Branch: refs/heads/master
Commit: da7148a13ed033421b2894684ff0ec34f31cb02b
Parents: 122c27b
Author: Suresh Kumar Anaparti <su...@accelerite.com>
Authored: Fri Dec 30 03:32:27 2016 +0530
Committer: Suresh Kumar Anaparti <su...@accelerite.com>
Committed: Thu Feb 9 10:55:29 2017 +0530

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da7148a1/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 851b868..c0c2338 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,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da7148a1/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 10136c6..09c7ec0 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");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da7148a1/server/src/com/cloud/test/DatabaseConfig.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java
index 13dab55..a27f671 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");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da7148a1/setup/db/db/schema-4920to41000-cleanup.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-4920to41000-cleanup.sql b/setup/db/db/schema-4920to41000-cleanup.sql
index 6a47078..6607065 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


[2/4] git commit: updated refs/heads/master to 50147a4

Posted by ra...@apache.org.
CLOUDSTACK-8737: Removed the missed out-of-band VR reboot code, not required based on persistent VR changes.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f35241a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f35241a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f35241a

Branch: refs/heads/master
Commit: 0f35241aade597be8114afff74a0b2de0b91560d
Parents: e02003d
Author: Suresh Kumar Anaparti <su...@accelerite.com>
Authored: Fri Dec 30 15:38:08 2016 +0530
Committer: Suresh Kumar Anaparti <su...@accelerite.com>
Committed: Mon Feb 13 15:07:17 2017 +0530

----------------------------------------------------------------------
 .../VirtualNetworkApplianceManagerImpl.java      | 19 -------------------
 1 file changed, 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f35241a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index c8161cc..a959544 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2620,25 +2620,6 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM
         return false;
     }
 
-    protected class RebootTask extends ManagedContextRunnable {
-
-        long _routerId;
-
-        public RebootTask(final long routerId) {
-            _routerId = routerId;
-        }
-
-        @Override
-        protected void runInContext() {
-            try {
-                s_logger.info("Reboot router " + _routerId + " to refresh network rules");
-                rebootRouter(_routerId, true);
-            } catch (final Exception e) {
-                s_logger.warn("Error while rebooting the router", e);
-            }
-        }
-    }
-
     protected boolean aggregationExecution(final AggregationControlCommand.Action action, final Network network, final List<DomainRouterVO> routers)
             throws AgentUnavailableException, ResourceUnavailableException {
 


[4/4] git commit: updated refs/heads/master to 50147a4

Posted by ra...@apache.org.
Merge pull request #1882 from Accelerite/CLOUDSTACK-8737_CodeCleanup

CLOUDSTACK-8737: Removed the missed out-of-band VR reboot code, not required based on persistent VR changes.

* pr/1882:
  CLOUDSTACK-8737: Removed the missed out-of-band VR reboot code, not required based on persistent VR changes.

Signed-off-by: Rajani Karuturi <ra...@accelerite.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50147a42
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50147a42
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50147a42

Branch: refs/heads/master
Commit: 50147a4208f5047a6ec69239b5c8099082523eb5
Parents: fe555e1 0f35241
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Feb 21 17:30:55 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Tue Feb 21 17:30:55 2017 +0530

----------------------------------------------------------------------
 .../VirtualNetworkApplianceManagerImpl.java      | 19 -------------------
 1 file changed, 19 deletions(-)
----------------------------------------------------------------------



[3/4] git commit: updated refs/heads/master to 50147a4

Posted by ra...@apache.org.
Merge pull request #1881 from Accelerite/CLOUDSTACK-9721

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 <ra...@accelerite.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe555e19
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe555e19
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe555e19

Branch: refs/heads/master
Commit: fe555e194e753b01a2e2bd9fdd4ec2e4dd96a0fc
Parents: 987be62 da7148a
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Tue Feb 21 17:30:30 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Tue Feb 21 17:30:30 2017 +0530

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe555e19/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe555e19/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------