Repository: stratos Updated Branches: refs/heads/master f3736f360 -> 9d852d2f7
adding activeBydefault to deployment policy and updating monitors Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9d852d2f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9d852d2f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9d852d2f Branch: refs/heads/master Commit: 9d852d2f7baff58abc33840c58e6e5d4fc17d103 Parents: f3736f3 Author: reka <[email protected]> Authored: Fri Nov 28 13:54:11 2014 +0530 Committer: reka <[email protected]> Committed: Fri Nov 28 13:54:32 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/monitor/ParentComponentMonitor.java | 5 +---- .../autoscaler/monitor/application/ApplicationMonitor.java | 1 + .../apache/stratos/autoscaler/partition/PartitionGroup.java | 9 +++++++++ .../endpoint/bean/autoscaler/partition/PartitionGroup.java | 2 ++ .../rest/endpoint/bean/util/converter/PojoConverter.java | 1 + .../src/main/resources/AutoScalerService.wsdl | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9d852d2f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java index 8368580..d7c3716 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java @@ -66,8 +66,6 @@ public abstract class ParentComponentMonitor extends Monitor { //terminating monitors list protected List<String> terminatingMonitorsList; - - public ParentComponentMonitor(ParentComponent component) throws DependencyBuilderException { aliasToActiveMonitorsMap = new HashMap<String, Monitor>(); inactiveMonitorsList = new ArrayList<String>(); @@ -147,8 +145,7 @@ public abstract class ParentComponentMonitor extends Monitor { * * @param applicationContexts the found applicationContexts to be started */ - private boolean startDependency(List<ApplicationChildContext> applicationContexts, List<String> instanceIds) - throws TopologyInConsistentException { + private boolean startDependency(List<ApplicationChildContext> applicationContexts, List<String> instanceIds) { if (applicationContexts != null && applicationContexts.isEmpty()) { //all the groups/clusters have been started and waiting for activation log.info("There is no child found for the [group]: " + this.id); http://git-wip-us.apache.org/repos/asf/stratos/blob/9d852d2f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java index 9b466b8..b92375f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java @@ -181,6 +181,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { public void startMinimumDependencies(Application application) throws TopologyInConsistentException, PolicyValidationException { //There will be one application instance + //FIXME when having multiple network partitions if (application.getInstanceContextCount() > 0) { startDependency(application); } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/9d852d2f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java index 8f959d1..8e563f0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionGroup.java @@ -31,6 +31,7 @@ public class PartitionGroup implements Serializable{ private static final long serialVersionUID = -8043298009352097370L; private String id; + private boolean activeByDefault; private String partitionAlgo; private Partition[] partitions; @@ -89,4 +90,12 @@ public class PartitionGroup implements Serializable{ public void setId(String id) { this.id = id; } + + public boolean isActiveByDefault() { + return activeByDefault; + } + + public void setActiveByDefault(boolean activeByDefault) { + this.activeByDefault = activeByDefault; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/9d852d2f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java index 4d817d8..3d9fbc6 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java @@ -29,6 +29,8 @@ public class PartitionGroup { public String partitionAlgo; + public boolean activeByDefault; + //partition Ids public List<Partition> partition; } http://git-wip-us.apache.org/repos/asf/stratos/blob/9d852d2f/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 7f5cd49..2c0b63f 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -407,6 +407,7 @@ public class PojoConverter { org.apache.stratos.autoscaler.stub.partition.PartitionGroup(); partitionGroup.setId(partitionGroupBeans.get(i).id); partitionGroup.setPartitionAlgo(partitionGroupBeans.get(i).partitionAlgo); + partitionGroup.setActiveByDefault(partitionGroupBeans.get(i).activeByDefault); if (partitionGroupBeans.get(i).partition != null && !partitionGroupBeans.get(i).partition.isEmpty()) { partitionGroup.setPartitions(convertToCCPartitionPojos(partitionGroupBeans.get(i).partition)); http://git-wip-us.apache.org/repos/asf/stratos/blob/9d852d2f/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl index 14f7dc3..3a67ffa 100644 --- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl +++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl @@ -137,6 +137,7 @@ <xs:import namespace="http://partition.deployment.stub.controller.cloud.stratos.apache.org/xsd";></xs:import> <xs:complexType name="PartitionGroup"> <xs:sequence> + <xs:element minOccurs="0" name="activeByDefault" type="xs:boolean"></xs:element> <xs:element minOccurs="0" name="id" nillable="true" type="xs:string"></xs:element> <xs:element minOccurs="0" name="partitionAlgo" nillable="true" type="xs:string"></xs:element> <xs:element maxOccurs="unbounded" minOccurs="0" name="partitions" nillable="true" type="ax215:Partition"></xs:element>
