You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/15 07:27:04 UTC
stratos git commit: Formatting autoscaler component
Repository: stratos
Updated Branches:
refs/heads/master 2b6178202 -> 50581a8a2
Formatting autoscaler component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/50581a8a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/50581a8a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/50581a8a
Branch: refs/heads/master
Commit: 50581a8a267d0f27a2457f7dd0865d771690d325
Parents: 2b61782
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri May 15 10:26:01 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri May 15 10:42:53 2015 +0530
----------------------------------------------------------------------
.../networkpartition/AllAtOnceAlgorithm.java | 2 +-
.../applications/dependency/DependencyTree.java | 4 ++--
.../internal/AutoscalerServiceComponent.java | 2 +-
.../stratos/autoscaler/monitor/MonitorFactory.java | 4 ++--
.../monitor/component/ApplicationMonitor.java | 7 ++++---
.../autoscaler/monitor/component/GroupMonitor.java | 6 +++---
.../monitor/component/ParentComponentMonitor.java | 3 +++
.../stratos/autoscaler/rule/RuleTasksDelegator.java | 2 +-
.../autoscaler/services/AutoscalerService.java | 3 ++-
.../cluster/ClusterStatusInactiveProcessor.java | 2 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 14 +++++++-------
11 files changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
index 1966d0c..3d5dc24 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
@@ -50,7 +50,7 @@ public class AllAtOnceAlgorithm implements NetworkPartitionAlgorithm {
@Override
public List<String> getDefaultNetworkPartitions(NetworkPartitionAlgorithmContext
- networkPartitionAlgorithmContext) {
+ networkPartitionAlgorithmContext) {
if (networkPartitionAlgorithmContext == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
index 9520868..f1291b4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java
@@ -88,7 +88,7 @@ public class DependencyTree {
for (ApplicationChildContext context : contexts) {
ApplicationChildContext childContext = getApplicationChildContextById(id,
context.getApplicationChildContextList());
- if(childContext != null) {
+ if (childContext != null) {
return childContext;
}
}
@@ -163,7 +163,7 @@ public class DependencyTree {
List<ApplicationChildContext> contexts1 =
traverseGraphByLevel(context.getApplicationChildContextList(),
parentMonitor, instanceId);
- if(contexts1 != null && !contexts1.isEmpty()) {
+ if (contexts1 != null && !contexts1.isEmpty()) {
return contexts1;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
index d6185d7..7d1afb9 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
@@ -222,7 +222,7 @@ public class AutoscalerServiceComponent {
ComponentStartUpSynchronizer componentStartUpSynchronizer =
ServiceReferenceHolder.getInstance().getComponentStartUpSynchronizer();
- if(componentStartUpSynchronizer.isEnabled()) {
+ if (componentStartUpSynchronizer.isEnabled()) {
componentStartUpSynchronizer.addEventListener(new ComponentActivationEventListener() {
@Override
public void activated(Component component) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java
index 4713403..0589546 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java
@@ -194,9 +194,9 @@ public class MonitorFactory {
* Updates ClusterContext for given cluster
*
* @param parentMonitor parent of the monitor
- * @param context the child-context from the startup-dependency tree
+ * @param context the child-context from the startup-dependency tree
* @return ClusterMonitor - Updated ClusterContext
- * @throws PolicyValidationException policy validation error
+ * @throws PolicyValidationException policy validation error
* @throws PartitionValidationException partition validation error
*/
public static ClusterMonitor getClusterMonitor(ParentComponentMonitor parentMonitor,
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
index 871bbf6..f0dfd50 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
@@ -174,7 +174,8 @@ public class ApplicationMonitor extends ParentComponentMonitor {
/**
* Handling the scale-down decision making
- * @param instanceContext instance-context which can be scaled-down
+ *
+ * @param instanceContext instance-context which can be scaled-down
* @param nwPartitionContext the network-partition-context of the instance
*/
private void handleScalingDownBeyondMin(InstanceContext instanceContext,
@@ -233,7 +234,7 @@ public class ApplicationMonitor extends ParentComponentMonitor {
// If it is default set, then application instance cannot be terminated.
List<String> defaultNetworkPartitions = algorithm.
getDefaultNetworkPartitions(algorithmContext);
- if(!defaultNetworkPartitions.contains(nwPartitionContext.getId())) {
+ if (!defaultNetworkPartitions.contains(nwPartitionContext.getId())) {
//Since it is not default network-partition, it can be terminated
// upon scale-down of the children as it has been created by bursting
ApplicationBuilder.handleApplicationInstanceTerminatingEvent(this.appId,
@@ -588,7 +589,7 @@ public class ApplicationMonitor extends ParentComponentMonitor {
"in the ApplicationsTopology. Hence not creating new AppInstance.");
instanceId = handleApplicationInstanceCreation(application, context, appInstance);
}
- if(instanceId != null) {
+ if (instanceId != null) {
instanceIdList.add(instanceId);
}
burstNPFound = true;
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/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 c2b88bd..a890824 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
@@ -741,9 +741,9 @@ public class GroupMonitor extends ParentComponentMonitor {
/**
* Creates the group instance and adds the required context objects
*
- * @param group the group
- * @param parentInstanceContext the parent instance context
- * @param partitionContext partition-context used to create the group instance
+ * @param group the group
+ * @param parentInstanceContext the parent instance context
+ * @param partitionContext partition-context used to create the group instance
* @param groupLevelNetworkPartitionContext the group level network partition context
*/
private String createGroupInstanceAndAddToMonitor(Group group, Instance parentInstanceContext,
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
index 9b252be..6953f0c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
@@ -856,6 +856,7 @@ public abstract class ParentComponentMonitor extends Monitor {
/**
* Scale dependencies from the children
+ *
* @return scale dependencies
*/
public Set<ScalingDependentList> getScalingDependencies() {
@@ -864,6 +865,7 @@ public abstract class ParentComponentMonitor extends Monitor {
/**
* Startup-order tree built among the children according to the specified startup-order
+ *
* @return startup-dependency-tree
*/
public DependencyTree getStartupDependencyTree() {
@@ -872,6 +874,7 @@ public abstract class ParentComponentMonitor extends Monitor {
/**
* This will give the network partitions used by this monitor
+ *
* @return network-partition-contexts
*/
public Map<String, NetworkPartitionContext> getNetworkPartitionContextsMap() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
index e942f1f..0f5c301 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
@@ -96,7 +96,7 @@ public class RuleTasksDelegator {
numberOfAdditionalInstancesRequired = (predictedValue - threshold) / gradient;
}
- if(predictedValue < threshold) {
+ if (predictedValue < threshold) {
//Since predicted-value is less, it can be scale-down
return min - 1;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
index 05ceac6..7a1f2c1 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
@@ -187,7 +187,8 @@ public interface AutoscalerService {
/**
* Dynamically update the properties of an Autoscaling Cluster Monitor
- * @param clusterId id of the cluster.
+ *
+ * @param clusterId id of the cluster.
* @param properties updated properties.
*/
boolean updateClusterMonitor(String clusterId, Properties properties) throws InvalidArgumentException;
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInactiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInactiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInactiveProcessor.java
index ed918e3..7d7a2e8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInactiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInactiveProcessor.java
@@ -55,7 +55,7 @@ public class ClusterStatusInactiveProcessor extends ClusterStatusProcessor {
} else {
log.warn(String.format("No possible state change found for [type] %s [cluster] %s " +
- "[instance] %s", type, clusterId, instanceId));
+ "[instance] %s", type, clusterId, instanceId));
}
}
return false;
http://git-wip-us.apache.org/repos/asf/stratos/blob/50581a8a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 09a09f2..b62d7c1 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -856,11 +856,11 @@ public class AutoscalerUtil {
}
}
- public static void validateStartupOrders (String groupName, String[] startupOrders) throws InvalidServiceGroupException {
+ public static void validateStartupOrders(String groupName, String[] startupOrders) throws InvalidServiceGroupException {
if (startupOrders == null || startupOrders.length == 0) {
- if(log.isDebugEnabled()) {
- log.debug("No Startup Order defined for group " + groupName);
+ if (log.isDebugEnabled()) {
+ log.debug("No Startup Order defined for group " + groupName);
}
return;
}
@@ -871,18 +871,18 @@ public class AutoscalerUtil {
for (String splittedStartupOrder : splittedStartupOrders) {
if (!splittedStartupOrder.trim().startsWith("cartridge.") && !splittedStartupOrder.trim().startsWith("group.")) {
// invalid startup order; should prefixed by either 'cartridge.' or 'group.'
- throw new InvalidServiceGroupException("Invalid Service Group: startup order [" + startupOrder + "] for group " + groupName +
+ throw new InvalidServiceGroupException("Invalid Service Group: startup order [" + startupOrder + "] for group " + groupName +
", should prefixed by either 'cartridge.' or 'group.'");
}
}
}
}
- public static void validateScalingDependencies (String groupName, String[] scalingDependents) throws InvalidServiceGroupException {
+ public static void validateScalingDependencies(String groupName, String[] scalingDependents) throws InvalidServiceGroupException {
if (scalingDependents == null || scalingDependents.length == 0) {
- if(log.isDebugEnabled()) {
- log.debug("No Scaling Dependents defined for group " + groupName);
+ if (log.isDebugEnabled()) {
+ log.debug("No Scaling Dependents defined for group " + groupName);
}
return;
}