Remove commented and unused codes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/95e72a34 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/95e72a34 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/95e72a34 Branch: refs/heads/master Commit: 95e72a34eaf07e3ce11f2a1511bb49dce8da778d Parents: b0ea845 Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Nov 9 16:17:50 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Nov 9 16:17:50 2014 +0530 ---------------------------------------------------------------------- .../cluster/VMServiceClusterMonitor.java | 89 -------------------- 1 file changed, 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/95e72a34/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java index 57b5850..a2164f5 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java @@ -63,16 +63,6 @@ public class VMServiceClusterMonitor extends VMClusterMonitor { readConfigurations(); } -//TODO why this method? -// private static void terminateMember(String memberId) { -// try { -// CloudControllerClient.getInstance().terminate(memberId); -// -// } catch (TerminationException e) { -// log.error("Unable to terminate member [member id ] " + memberId, e); -// } -// } - @Override public void run() { while (!isDestroyed()) { @@ -102,50 +92,6 @@ public class VMServiceClusterMonitor extends VMClusterMonitor { } -//TODO why this method? -// @Override -// public void terminateAllMembers() { -// -// Thread memberTerminator = new Thread(new Runnable() { -// public void run() { -// -// for (NetworkPartitionContext networkPartitionContext : networkPartitionCtxts.values()) { -// for (PartitionContext partitionContext : networkPartitionContext.getPartitionCtxts().values()) { -// //if (log.isDebugEnabled()) { -// log.info("Starting to terminate all members in Network Partition [ " + -// networkPartitionContext.getId() + " ], Partition [ " + -// partitionContext.getPartitionId() + " ]"); -// // } -// // need to terminate active, pending and obsolete members -// -// // active members -// for (MemberContext activeMemberCtxt : partitionContext.getActiveMembers()) { -// log.info("Terminating active member [member id] " + activeMemberCtxt.getMemberId()); -// terminateMember(activeMemberCtxt.getMemberId()); -// } -// -// // pending members -// for (MemberContext pendingMemberCtxt : partitionContext.getPendingMembers()) { -// log.info("Terminating pending member [member id] " + pendingMemberCtxt.getMemberId()); -// terminateMember(pendingMemberCtxt.getMemberId()); -// } -// -// // obsolete members -// for (String obsoleteMemberId : partitionContext.getObsoletedMembers()) { -// log.info("Terminating obsolete member [member id] " + obsoleteMemberId); -// terminateMember(obsoleteMemberId); -// } -// -//// terminateAllFactHandle = AutoscalerRuleEvaluator.evaluateTerminateAll -//// (terminateAllKnowledgeSession, terminateAllFactHandle, partitionContext); -// } -// } -// } -// }, "Member Terminator - [cluster id] " + this.clusterId); -// -// memberTerminator.start(); -// } - private boolean isPrimaryMember(MemberContext memberContext) { Properties props = memberContext.getProperties(); if (log.isDebugEnabled()) { @@ -209,41 +155,6 @@ public class VMServiceClusterMonitor extends VMClusterMonitor { } - /*boolean rifReset = networkPartitionContext.isRifReset(); - boolean memoryConsumptionReset = networkPartitionContext.isMemoryConsumptionReset(); - boolean loadAverageReset = networkPartitionContext.isLoadAverageReset(); - - if (log.isDebugEnabled()) { - log.debug("flag of rifReset: " + rifReset + " flag of memoryConsumptionReset" + memoryConsumptionReset - + " flag of loadAverageReset" + loadAverageReset); - } - if (rifReset || memoryConsumptionReset || loadAverageReset) { - - scaleCheckKnowledgeSession.setGlobal("clusterId", clusterId); - //scaleCheckKnowledgeSession.setGlobal("deploymentPolicy", deploymentPolicy); - scaleCheckKnowledgeSession.setGlobal("autoscalePolicy", autoscalePolicy); - scaleCheckKnowledgeSession.setGlobal("rifReset", rifReset); - scaleCheckKnowledgeSession.setGlobal("mcReset", memoryConsumptionReset); - scaleCheckKnowledgeSession.setGlobal("laReset", loadAverageReset); - scaleCheckKnowledgeSession.setGlobal("lbRef", lbReferenceType); - scaleCheckKnowledgeSession.setGlobal("isPrimary", false); - scaleCheckKnowledgeSession.setGlobal("primaryMembers", primaryMemberListInNetworkPartition); - - if (log.isDebugEnabled()) { - log.debug(String.format("Running scale check for network partition %s ", networkPartitionContext.getId())); - log.debug(" Primary members : " + primaryMemberListInNetworkPartition); - } - - scaleCheckFactHandle = AutoscalerRuleEvaluator.evaluateScaleCheck(scaleCheckKnowledgeSession - , scaleCheckFactHandle, networkPartitionContext); - - networkPartitionContext.setRifReset(false); - networkPartitionContext.setMemoryConsumptionReset(false); - networkPartitionContext.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())); - }*/ } }
