Repository: stratos Updated Branches: refs/heads/master 269cad9e0 -> 39cfa6aff
Formatting code to adhere the 120 colomn limit Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/39cfa6af Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/39cfa6af Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/39cfa6af Branch: refs/heads/master Commit: 39cfa6aff3292a22f213d57e8b7fa5163c146a5e Parents: 269cad9 Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Dec 2 15:43:27 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Dec 2 15:43:27 2014 +0530 ---------------------------------------------------------------------- .../context/cluster/ClusterInstanceContext.java | 6 +++--- .../AutoscalerHealthStatEventReceiver.java | 6 ++++-- .../monitor/cluster/VMClusterMonitor.java | 21 ++++++++++++-------- 3 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/39cfa6af/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java index f25e9b5..e421b38 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java @@ -198,8 +198,8 @@ public class ClusterInstanceContext extends InstanceContext { averageRequestServedPerInstanceReset = true; if (log.isDebugEnabled()) { - log.debug(String.format("Average Requesets Served Per Instance stats are reset, ready to do scale check [network partition] %s" - , this.id)); + log.debug(String.format("Average Requesets Served Per Instance stats are reset, ready to do scale check " + + "[network partition] %s" , this.id)); } } @@ -460,9 +460,9 @@ public class ClusterInstanceContext extends InstanceContext { public void setMinMembers(int minMembers) { this.minMembers = minMembers; - } public String getNetworkPartitionId() { return networkPartitionId; } + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/39cfa6af/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java index 7cd2fa6..23a032b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/health/AutoscalerHealthStatEventReceiver.java @@ -375,7 +375,8 @@ public class AutoscalerHealthStatEventReceiver implements Runnable { healthStatEventReceiver.addEventListener(new MemberGradientOfMemoryConsumptionEventListener() { @Override protected void onEvent(org.apache.stratos.messaging.event.Event event) { - MemberGradientOfMemoryConsumptionEvent memberGradientOfMemoryConsumptionEvent = (MemberGradientOfMemoryConsumptionEvent) event; + MemberGradientOfMemoryConsumptionEvent memberGradientOfMemoryConsumptionEvent + = (MemberGradientOfMemoryConsumptionEvent) event; String memberId = memberGradientOfMemoryConsumptionEvent.getMemberId(); Member member = getMemberByMemberId(memberId); if (null == member) { @@ -488,7 +489,8 @@ public class AutoscalerHealthStatEventReceiver implements Runnable { healthStatEventReceiver.addEventListener(new SecondDerivativeOfRequestsInFlightEventListener() { @Override protected void onEvent(org.apache.stratos.messaging.event.Event event) { - SecondDerivativeOfRequestsInFlightEvent secondDerivativeOfRequestsInFlightEvent = (SecondDerivativeOfRequestsInFlightEvent) event; + SecondDerivativeOfRequestsInFlightEvent secondDerivativeOfRequestsInFlightEvent + = (SecondDerivativeOfRequestsInFlightEvent) event; String clusterId = secondDerivativeOfRequestsInFlightEvent.getClusterId(); AutoscalerContext asCtx = AutoscalerContext.getInstance(); AbstractClusterMonitor monitor; http://git-wip-us.apache.org/repos/asf/stratos/blob/39cfa6af/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java index 6ecffc9..b52c44f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java @@ -202,7 +202,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { getMinCheckKnowledgeSession().setGlobal("clusterId", getClusterId()); getMinCheckKnowledgeSession().setGlobal("isPrimary", hasPrimary); - getMinCheckKnowledgeSession().setGlobal("algorithmName", networkPartitionContext.getPartitionAlgorithm()); + getMinCheckKnowledgeSession().setGlobal("algorithmName", + networkPartitionContext.getPartitionAlgorithm()); if (log.isDebugEnabled()) { log.debug(String.format("Running minimum check for cluster instance %s ", @@ -232,7 +233,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { getScaleCheckKnowledgeSession().setGlobal("instance", instanceContext); getScaleCheckKnowledgeSession().setGlobal("clusterId", getClusterId()); - getScaleCheckKnowledgeSession().setGlobal("autoscalePolicy", vmClusterContext.getAutoscalePolicy()); + getScaleCheckKnowledgeSession().setGlobal("autoscalePolicy", + vmClusterContext.getAutoscalePolicy()); getScaleCheckKnowledgeSession().setGlobal("rifReset", rifReset); getScaleCheckKnowledgeSession().setGlobal("mcReset", memoryConsumptionReset); getScaleCheckKnowledgeSession().setGlobal("laReset", loadAverageReset); @@ -240,7 +242,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { getScaleCheckKnowledgeSession().setGlobal("primaryMembers", primaryMemberListInClusterInstance); if (log.isDebugEnabled()) { - log.debug(String.format("Running scale check for network partition %s ", networkPartitionContext.getId())); + log.debug(String.format("Running scale check for network partition %s ", + networkPartitionContext.getId())); log.debug(" Primary members : " + primaryMemberListInClusterInstance); } @@ -251,8 +254,9 @@ public class VMClusterMonitor extends AbstractClusterMonitor { instanceContext.setMemoryConsumptionReset(false); instanceContext.setLoadAverageReset(false); } else if (log.isDebugEnabled()) { - log.debug(String.format("Scale rule will not run since the LB statistics have not received before this " + - "cycle for network partition %s", networkPartitionContext.getId())); + log.debug(String.format("Scale rule will not run since the LB statistics have not " + + "received before this cycle for network partition %s", + networkPartitionContext.getId())); } @@ -492,7 +496,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { } } - public void handleAverageRequestsServingCapabilityEvent(AverageRequestsServingCapabilityEvent averageRequestsServingCapabilityEvent) { + public void handleAverageRequestsServingCapabilityEvent( + AverageRequestsServingCapabilityEvent averageRequestsServingCapabilityEvent) { String clusterId = averageRequestsServingCapabilityEvent.getClusterId(); String instanceId = averageRequestsServingCapabilityEvent.getInstanceId(); @@ -849,8 +854,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { } if (log.isInfoEnabled()) { - log.info(String.format("Member is terminated and removed from the active members list: [member] %s [partition] %s [cluster] %s ", - memberId, partitionId, clusterId)); + log.info(String.format("Member is terminated and removed from the active members list: [member] %s " + + "[partition] %s [cluster] %s ", memberId, partitionId, clusterId)); } } catch (Exception e) { String msg = "Error processing event " + e.getLocalizedMessage();
