Repository: stratos Updated Branches: refs/heads/master b7897af9c -> c8c60fbd0
Removing networkpartition context as part of application instance termination Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c8c60fbd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c8c60fbd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c8c60fbd Branch: refs/heads/master Commit: c8c60fbd0f9ab5693fd8e2bebb3424f7d9fd4de0 Parents: ab5d447 Author: reka <[email protected]> Authored: Tue Jun 30 11:23:23 2015 +0530 Committer: reka <[email protected]> Committed: Tue Jun 30 11:23:49 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/applications/topic/ApplicationBuilder.java | 2 ++ .../autoscaler/monitor/component/ApplicationMonitor.java | 6 +++--- .../monitor/component/ParentComponentMonitor.java | 9 +++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c8c60fbd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java index 44a6786..36ada2d 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java @@ -285,6 +285,8 @@ public class ApplicationBuilder { getNetworkPartitionContext(applicationInstance. getNetworkPartitionId()); networkPartitionContext.removeInstanceContext(instanceId); + applicationMonitor.removeNetworkPartitionContext(applicationInstance. + getNetworkPartitionId()); applicationMonitor.removeInstance(instanceId); application.removeInstance(instanceId); ApplicationHolder.persistApplication(application); http://git-wip-us.apache.org/repos/asf/stratos/blob/c8c60fbd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java index 87e035f..fddc960 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java @@ -153,8 +153,8 @@ public class ApplicationMonitor extends ParentComponentMonitor { //Checking for whether minimum application instances are there. checkForMinimumApplicationInstances(application, defaultNetworkPartitions); - //Checking for whether any application instances need to be terminated. - checkForApplicationInstanceTermination(application, defaultNetworkPartitions); + /*//Checking for whether any application instances need to be terminated. + checkForApplicationInstanceTermination(application, defaultNetworkPartitions);*/ } @@ -325,7 +325,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { } } //Starting the dependencies - if(!instanceIds.isEmpty()) { + if(instanceIds.isEmpty()) { startDependency(application, instanceIds); } http://git-wip-us.apache.org/repos/asf/stratos/blob/c8c60fbd/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java index 717edc3..7e32022 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java @@ -944,6 +944,15 @@ public abstract class ParentComponentMonitor extends Monitor { } /** + * This will give the network partitions used by this monitor + * + * @return network-partition-contexts + */ + public void removeNetworkPartitionContext(String networkPartitionId) { + networkPartitionContextsMap.remove(networkPartitionId); + } + + /** * Inner class used a Thread to start the relevant child monitor in a asynchronous manner */ private class MonitorAdder implements Runnable {
