Repository: stratos Updated Branches: refs/heads/master bc1b31da7 -> 917be8eb2
updating appmonitor with network partition and updating the api in cc Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/917be8eb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/917be8eb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/917be8eb Branch: refs/heads/master Commit: 917be8eb2bf741fd9760df2221354129ae2de0fe Parents: bc1b31d Author: reka <[email protected]> Authored: Fri Nov 28 18:18:54 2014 +0530 Committer: reka <[email protected]> Committed: Fri Nov 28 18:20:34 2014 +0530 ---------------------------------------------------------------------- .../monitor/component/ApplicationMonitor.java | 16 +++++++++------- .../controller/impl/CloudControllerServiceImpl.java | 2 +- .../interfaces/CloudControllerService.java | 5 +++-- 3 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/917be8eb/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 5f90e25..ccd0f3d 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 @@ -225,13 +225,15 @@ public class ApplicationMonitor extends ParentComponentMonitor { boolean burstNPFound = false; for (NetworkPartition networkPartition : deploymentPolicy.getNetworkPartitions()) { if(!networkPartition.isActiveByDefault()) { - ApplicationLevelNetworkPartitionContext context = - new ApplicationLevelNetworkPartitionContext(networkPartition.getId()); - context.setCreatedOnBurst(true); - instanceId = createApplicationInstance(application, networkPartition.getId()); - context.addInstanceContext(application.getInstanceContexts(instanceId)); - this.networkPartitionCtxts.put(context.getId(), context); - burstNPFound = true; + if(!this.networkPartitionCtxts.containsKey(networkPartition.getId())) { + ApplicationLevelNetworkPartitionContext context = + new ApplicationLevelNetworkPartitionContext(networkPartition.getId()); + context.setCreatedOnBurst(true); + instanceId = createApplicationInstance(application, networkPartition.getId()); + context.addInstanceContext(application.getInstanceContexts(instanceId)); + this.networkPartitionCtxts.put(context.getId(), context); + burstNPFound = true; + } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/917be8eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 67b6e09..2eea3a0 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -1991,7 +1991,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public void updateClusterStatus(String clusterId, String instanceId, ClusterStatus status) { + public void updateClusterStatus(String serviceName, String clusterId, String instanceId, ClusterStatus status) { //TODO } http://git-wip-us.apache.org/repos/asf/stratos/blob/917be8eb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java index 447ee3e..1e71129 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/CloudControllerService.java @@ -159,11 +159,12 @@ public interface CloudControllerService { /** * Update the topology with current cluster status. + * @param serviceName id of service which the cluster belongs to. * @param clusterId id of the subjected cluster. - * @param instanceId id of the cluster instance + * @param instanceId id of the cluster instance. * @param status total number of replicas to be set to the controller. */ - void updateClusterStatus(String clusterId, String instanceId, ClusterStatus status); + void updateClusterStatus(String serviceName, String clusterId, String instanceId, ClusterStatus status); /** * Unregister a docker service identified by the given cluster id.
