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 2015/07/02 13:04:58 UTC
stratos git commit: setting network partition min/max for group
scaled instances
Repository: stratos
Updated Branches:
refs/heads/master e1876b040 -> 15d8ab99c
setting network partition min/max for group scaled instances
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/15d8ab99
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/15d8ab99
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/15d8ab99
Branch: refs/heads/master
Commit: 15d8ab99c2452d2dce1ffac34ac11da6d61d8001
Parents: e1876b0
Author: reka <rt...@gmail.com>
Authored: Thu Jul 2 16:26:18 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Jul 2 16:26:18 2015 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/component/GroupMonitor.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/15d8ab99/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 72a8dcf..9224997 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
@@ -185,12 +185,10 @@ public class GroupMonitor extends ParentComponentMonitor {
getActiveInstancesCount();
if (activeAppInstances > 0) {
//Creating new group instance based on the existing parent instances
- if (log.isDebugEnabled()) {
- log.debug("Creating a group instance of [application] "
+ log.info("Creating a group instance of [application] "
+ appId + " [group] " + id +
" as the the minimum required instances are not met");
- }
createInstanceOnDemand(parentInstanceContext.getId());
}
}
@@ -208,12 +206,10 @@ public class GroupMonitor extends ParentComponentMonitor {
for (int i = 0; i < instancesToBeTerminated; i++) {
InstanceContext instanceContext = contextList.get(i);
//scale down only when extra instances found
- if (log.isDebugEnabled()) {
- log.debug("Terminating a group instance of [application] "
+ log.info("Terminating a group instance of [application] "
+ appId + " [group] " + id + " as it exceeded the " +
"maximum no of instances by " + instancesToBeTerminated);
- }
handleScalingDownBeyondMin(instanceContext,
networkPartitionContext, true);
@@ -978,6 +974,11 @@ public class GroupMonitor extends ParentComponentMonitor {
String parentPartitionId = parentInstanceContext.getPartitionId();
int groupMax = group.getGroupMaxInstances();
int groupMin = group.getGroupMinInstances();
+
+ //Setting the network-partition minimum instances as group min instances
+ parentLevelNetworkPartitionContext.setMinInstanceCount(groupMin);
+ parentLevelNetworkPartitionContext.setMaxInstanceCount(groupMax);
+
List<Instance> instances = group.getInstanceContextsWithParentId(parentInstanceId);
if (instances.isEmpty()) {
//Need to create totally new group instance