You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/05 20:54:52 UTC
[3/3] stratos git commit: fixing p2 generation issues and group level
policy handling issues
fixing p2 generation issues and group level policy handling issues
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fc554896
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fc554896
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fc554896
Branch: refs/heads/master
Commit: fc5548960893c99762668ddc3471ff3641b42638
Parents: bd859e7
Author: reka <rt...@gmail.com>
Authored: Sat Dec 6 01:24:28 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Sat Dec 6 01:24:28 2014 +0530
----------------------------------------------------------------------
.../applications/parser/DefaultApplicationParser.java | 2 +-
.../context/partition/GroupLevelPartitionContext.java | 1 -
.../autoscaler/monitor/component/GroupMonitor.java | 7 +++++--
products/stratos/modules/p2-profile-gen/pom.xml | 10 +++++-----
4 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/fc554896/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 5472163..de9110f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -794,7 +794,7 @@ public class DefaultApplicationParser implements ApplicationParser {
// Create text payload
PayloadData payloadData = ApplicationUtils.createPayload(appId, groupName, cartridgeInfo, subscriptionKey, tenantId, clusterId,
hostname, repoUrl, alias, null, dependencyAliases, properties);
- payloadData.add("TOKEN", createToken(appId));
+ //TOD payloadData.add("TOKEN", createToken(appId));
String textPayload = payloadData.toString();
return new ApplicationClusterContext(cartridgeInfo.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB);
http://git-wip-us.apache.org/repos/asf/stratos/blob/fc554896/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
index 3b41986..7400415 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/GroupLevelPartitionContext.java
@@ -43,7 +43,6 @@ public class GroupLevelPartitionContext extends PartitionContext implements Seri
private static final long serialVersionUID = -2920388667345980487L;
private static final Log log = LogFactory.getLog(GroupLevelPartitionContext.class);
private final int PENDING_MEMBER_FAILURE_THRESHOLD = 5;
- private String partitionId;
private String serviceName;
private int minimumInstanceCount = 0;
private int pendingInstancesFailureCount = 0;
http://git-wip-us.apache.org/repos/asf/stratos/blob/fc554896/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
index e34fabb..dd658ff 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
@@ -480,12 +480,15 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable {
if(existingGroupInstances.size() <= groupMin) {
for (int i = 0; i < groupMin - existingGroupInstances.size(); i++) {
// Get partitionContext to create instance in
+ List<GroupLevelPartitionContext> partitionContexts = groupLevelNetworkPartitionContext.
+ getPartitionCtxts();
+ GroupLevelPartitionContext[] groupLevelPartitionContexts =
+ new GroupLevelPartitionContext[partitionContexts.size()];
if (parentPartitionId == null) {
AutoscaleAlgorithm algorithm = this.getAutoscaleAlgorithm(
groupLevelNetworkPartitionContext.getPartitionAlgorithm());
partitionContext = algorithm.getNextScaleUpPartitionContext(
- (PartitionContext[]) groupLevelNetworkPartitionContext.
- getPartitionCtxts().toArray());
+ (partitionContexts.toArray(groupLevelPartitionContexts)));
} else {
partitionContext = groupLevelNetworkPartitionContext.
getPartitionContextById(parentPartitionId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/fc554896/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 35c4b48..c5b3e92 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -333,7 +333,7 @@
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.cassandra.common.feature:${carbon.platform.version}</featureArtifactDef>
<!-- Common features -->
<featureArtifactDef>org.apache.stratos:org.apache.stratos.metadata.client.feature:${project.version}</featureArtifactDef>
- <featureArtifactDef>org.apache.stratos:org.apache.stratos.custom.handlers.feature:${project.version}</featureArtifactDef>
+ <!--featureArtifactDef>org.apache.stratos:org.apache.stratos.custom.handlers.feature:${project.version}</featureArtifactDef-->
</featureArtifacts>
</configuration>
</execution>
@@ -562,10 +562,10 @@
<id>org.wso2.carbon.user.mgt.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
- <feature>
+ <!--feature>
<id>org.apache.stratos.custom.handlers.feature.group</id>
<version>${project.version}</version>
- </feature>
+ </feature-->
</features>
</configuration>
</execution>
@@ -1002,10 +1002,10 @@
<id>org.apache.stratos.metadata.client.feature.group</id>
<version>${project.version}</version>
</feature>
- <feature>
+ <!--feature>
<id>org.apache.stratos.custom.handlers.feature.group</id>
<version>${project.version}</version>
- </feature>
+ </feature-->
</features>
</configuration>