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:50 UTC
[1/3] stratos git commit: fixing build failure
Repository: stratos
Updated Branches:
refs/heads/master cb33a2090 -> fc5548960
fixing build failure
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bd859e7d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bd859e7d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bd859e7d
Branch: refs/heads/master
Commit: bd859e7de9651fee456284a3e8844d5bb6bd70d6
Parents: 6c5c13a
Author: reka <rt...@gmail.com>
Authored: Sat Dec 6 00:25:49 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Sat Dec 6 00:27:53 2014 +0530
----------------------------------------------------------------------
features/common/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bd859e7d/features/common/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/pom.xml b/features/common/pom.xml
index 1f9ab37..37c8b93 100644
--- a/features/common/pom.xml
+++ b/features/common/pom.xml
@@ -32,7 +32,7 @@
<modules>
<module>org.apache.stratos.metadata.client.feature</module>
- <module>org.apache.stratos.custom.handlers.feature</module>
+ <!--module>org.apache.stratos.custom.handlers.feature</module-->
</modules>
</project>
[3/3] stratos git commit: fixing p2 generation issues and group level
policy handling issues
Posted by re...@apache.org.
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>
[2/3] stratos git commit: fixing issue while parsing deployment
policy for group
Posted by re...@apache.org.
fixing issue while parsing deployment policy for group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6c5c13a0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6c5c13a0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6c5c13a0
Branch: refs/heads/master
Commit: 6c5c13a07daf29902b44c60dd4f2bf6cd9b4a3a4
Parents: cb33a20
Author: reka <rt...@gmail.com>
Authored: Sat Dec 6 00:08:33 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Sat Dec 6 00:27:53 2014 +0530
----------------------------------------------------------------------
.../monitor/component/GroupMonitor.java | 23 +++++++++++++-------
.../domain/applications/ParentComponent.java | 5 +++--
2 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6c5c13a0/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 c8df090..e34fabb 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
@@ -299,9 +299,11 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable {
Instance parentInstanceContext;
Application application = ApplicationHolder.getApplications().getApplication(this.appId);
- if (this.id.equals(appId)) {
+ //if parent is application
+ if (this.parent.getId().equals(appId)) {
parentInstanceContext = application.getInstanceContexts(parentInstanceId);
} else {
+ //if parent is group
Group parentGroup = application.getGroupRecursively(this.parent.getId());
parentInstanceContext = parentGroup.getInstanceContexts(parentInstanceId);
}
@@ -456,7 +458,7 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable {
String parentPartitionId = parentInstanceContext.getPartitionId();
// Create GroupInstance for partition instance and add to required contexts for minimum instance count
- int groupMin = groupLevelNetworkPartitionContext.getMinInstanceCount();
+ int groupMin = group.getGroupMinInstances();
//Have to check whether group has generated its own instances
List<Instance> existingGroupInstances = group.getInstanceContextsWithParentId(parentInstanceId);
@@ -526,7 +528,7 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable {
String groupInstanceId;
PartitionContext partitionContext;
String parentPartitionId = parentInstanceContext.getPartitionId();
- int groupMax = groupLevelNetworkPartitionContext.getMaxInstanceCount();
+ int groupMax = group.getGroupMaxInstances();
if(group.getInstanceContextCount() < groupMax) {
// Get partitionContext to create instance in
if (parentPartitionId == null) {
@@ -539,11 +541,16 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable {
partitionContext = groupLevelNetworkPartitionContext.
getPartitionContextById(parentPartitionId);
}
- groupInstanceId = createGroupInstanceAndAddToMonitor(group, parentInstanceContext,
- partitionContext,
- groupLevelNetworkPartitionContext,
- null);
- startDependency(group, groupInstanceId);
+ if(partitionContext != null) {
+ groupInstanceId = createGroupInstanceAndAddToMonitor(group, parentInstanceContext,
+ partitionContext,
+ groupLevelNetworkPartitionContext,
+ null);
+ startDependency(group, groupInstanceId);
+ } else {
+ log.warn("[Group] " + group.getUniqueIdentifier() + " has reached the maximum limit as " +
+ "[max] " + groupMax + ". Hence trying to notify the parent.");
+ }
} else {
log.warn("[Group] " + group.getUniqueIdentifier() + " has reached the maximum limit as " +
"[max] " + groupMax + ". Hence trying to notify the parent.");
http://git-wip-us.apache.org/repos/asf/stratos/blob/6c5c13a0/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java
index 36eb406..8b8b879 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/applications/ParentComponent.java
@@ -268,10 +268,11 @@ public abstract class ParentComponent<T extends Instance> implements Serializabl
*/
public List<Instance> getInstanceContextsWithParentId (String parentInstanceId) {
// if map is empty, return null
+ List<Instance> contexts = new ArrayList<Instance>();
+
if (getInstanceIdToInstanceContextMap().isEmpty()) {
- return null;
+ return contexts;
}
- List<Instance> contexts = new ArrayList<Instance>();
// if instanceId is null, just get the first InstanceContext
if (parentInstanceId == null) {