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/06 09:37:22 UTC
[2/2] stratos git commit: fixing issue while parsing deployment
policy for group
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/c630686d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c630686d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c630686d
Branch: refs/heads/master
Commit: c630686dbb81ae14579f96cdee6f8ee914c94468
Parents: 3564ccf
Author: reka <rt...@gmail.com>
Authored: Sat Dec 6 13:12:01 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Sat Dec 6 14:07:07 2014 +0530
----------------------------------------------------------------------
.../applications/topic/ApplicationBuilder.java | 12 ++++++++----
.../autoscaler/context/cluster/VMClusterContext.java | 3 ++-
.../autoscaler/monitor/component/GroupMonitor.java | 11 +++++------
.../applications/GroupInstanceCreatedProcessor.java | 4 ++--
4 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c630686d/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 b0db089..63d8ab9 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
@@ -394,9 +394,11 @@ public class ApplicationBuilder {
}
}
- public static GroupInstance handleGroupInstanceCreatedEvent(String appId, String groupId, String instanceId,
- String parentId, String partitionId,
- String networkPartitionId) {
+ public static GroupInstance handleGroupInstanceCreatedEvent(String appId, String groupId,
+ String parentId,
+ String networkPartitionId,
+ String instanceId,
+ String partitionId) {
if (log.isDebugEnabled()) {
log.debug("Handling Group creation for the [group]: " + groupId +
" in the [application] " + appId);
@@ -425,11 +427,13 @@ public class ApplicationBuilder {
//setting the status, persist and publish
instance = new GroupInstance(groupId, instanceId);
instance.setParentId(parentId);
+ instance.setPartitionId(partitionId);
+ instance.setNetworkPartitionId(networkPartitionId);
instance.setStatus(status);
group.addInstance(instanceId, instance);
//updateGroupMonitor(appId, groupId, status);
ApplicationHolder.persistApplication(application);
- //ApplicationsEventPublisher.sendGroupInstanceCreatedEvent(appId, groupId);
+ ApplicationsEventPublisher.sendGroupInstanceCreatedEvent(appId, groupId, instance);
} else {
log.warn("Group Instance Context already exists: [group-id] " + groupId +
" [Group-Instance-Id] " + instanceId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/c630686d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
index f506596..961694f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/VMClusterContext.java
@@ -246,7 +246,8 @@ public class VMClusterContext extends AbstractClusterContext {
Application application = ApplicationHolder.getApplications().
getApplication(cluster.getAppId());
ClusterDataHolder dataHolder = application.
- getClusterData(AutoscalerUtil.getAliasFromClusterId(clusterId));
+ getClusterDataHolderRecursivelyByAlias(
+ AutoscalerUtil.getAliasFromClusterId(clusterId));
minInstances = dataHolder.getMinInstances();
maxInstances = dataHolder.getMaxInstances();
} finally {
http://git-wip-us.apache.org/repos/asf/stratos/blob/c630686d/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 dd658ff..fb96bea 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
@@ -410,8 +410,8 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable {
if (groupInstance == null) {
partitionId = partitionContext.getPartitionId();
- groupInstance = createGroupInstance(group, parentInstanceContext.getInstanceId(),
- partitionId, parentInstanceContext.getNetworkPartitionId());
+ groupInstance = createGroupInstance(group, parentInstanceContext.getNetworkPartitionId(),
+ parentInstanceContext.getInstanceId(), partitionId);
}
this.addInstance(groupInstance);
@@ -571,8 +571,8 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable {
* @param networkPartitionId
* @return
*/
- private GroupInstance createGroupInstance(Group group, String parentInstanceId, String partitionId,
- String networkPartitionId) {
+ private GroupInstance createGroupInstance(Group group, String networkPartitionId,
+ String parentInstanceId, String partitionId ) {
String instanceId = parentInstanceId;
int minGroupInstances = group.getGroupMinInstances();
int maxGroupInstances = group.getGroupMaxInstances();
@@ -584,8 +584,7 @@ public class GroupMonitor extends ParentComponentMonitor implements Runnable {
instanceId = this.generateInstanceId(group);
}
return ApplicationBuilder.handleGroupInstanceCreatedEvent(appId, group.getUniqueIdentifier(),
- instanceId, parentInstanceId,
- networkPartitionId, partitionId);
+ parentInstanceId, networkPartitionId, instanceId, partitionId);
}
public Map<String, GroupLevelNetworkPartitionContext> getNetworkPartitionCtxts() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/c630686d/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceCreatedProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceCreatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceCreatedProcessor.java
index aa17fbf..4031d55 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceCreatedProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceCreatedProcessor.java
@@ -97,9 +97,9 @@ public class GroupInstanceCreatedProcessor extends MessageProcessor {
// Apply changes to the applications
String instanceId = event.getGroupInstance().getInstanceId();
GroupInstance context = group.getInstanceContexts(instanceId);
- if(context == null) {
+ if(context != null) {
if (log.isWarnEnabled()) {
- log.warn(String.format("Group Instance not exists in Group: [AppId] %s [groupId] %s " +
+ log.warn(String.format("Group Instance already exists in Group: [AppId] %s [groupId] %s " +
"[instanceId] %s", event.getAppId(), event.getGroupId(),
instanceId));
return false;