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 2014/12/01 18:01:03 UTC
stratos git commit: Removing LB reference typefrom cluster monitor
Repository: stratos
Updated Branches:
refs/heads/master f2843a4fe -> 48f8a81e3
Removing LB reference typefrom cluster monitor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/48f8a81e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/48f8a81e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/48f8a81e
Branch: refs/heads/master
Commit: 48f8a81e3a3d1e449047c49366643f09d5fdff82
Parents: f2843a4
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Dec 1 22:31:49 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Dec 1 22:31:49 2014 +0530
----------------------------------------------------------------------
.../monitor/cluster/ClusterMonitorFactory.java | 14 ++++++-------
.../cluster/VMServiceClusterMonitor.java | 22 ++++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/48f8a81e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java
index 5b49cd9..1159fc5 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java
@@ -71,13 +71,13 @@ public class ClusterMonitorFactory {
java.util.Properties props = cluster.getProperties();
if (props != null) {
- if (props.containsKey(StratosConstants.LOAD_BALANCER_REF)) {
- String value = props.getProperty(StratosConstants.LOAD_BALANCER_REF);
- clusterMonitor.setLbReferenceType(value);
- if (log.isDebugEnabled()) {
- log.debug("Set the lb reference type: " + value);
- }
- }
+// if (props.containsKey(StratosConstants.LOAD_BALANCER_REF)) {
+// String value = props.getProperty(StratosConstants.LOAD_BALANCER_REF);
+// clusterMonitor.setLbReferenceType(value);
+// if (log.isDebugEnabled()) {
+// log.debug("Set the lb reference type: " + value);
+// }
+// }
// set hasPrimary property
// hasPrimary is true if there are primary members available in that cluster
http://git-wip-us.apache.org/repos/asf/stratos/blob/48f8a81e/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 02c4ee6..12ce038 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
@@ -52,7 +52,7 @@ import java.util.List;
public class VMServiceClusterMonitor extends VMClusterMonitor {
private static final Log log = LogFactory.getLog(VMServiceClusterMonitor.class);
- private String lbReferenceType;
+// private String lbReferenceType;
private boolean hasPrimary;
private float scalingFactorBasedOnDependencies = 1.0f;
@@ -146,7 +146,7 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
}
primaryMemberListInNetworkPartition.addAll(primaryMemberListInPartition);
getMinCheckKnowledgeSession().setGlobal("clusterId", getClusterId());
- getMinCheckKnowledgeSession().setGlobal("lbRef", lbReferenceType);
+// getMinCheckKnowledgeSession().setGlobal("lbRef", lbReferenceType);
getMinCheckKnowledgeSession().setGlobal("isPrimary", hasPrimary);
getMinCheckKnowledgeSession().setGlobal("instanceId",
instanceContext.getId());
@@ -185,7 +185,7 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
getScaleCheckKnowledgeSession().setGlobal("rifReset", rifReset);
getScaleCheckKnowledgeSession().setGlobal("mcReset", memoryConsumptionReset);
getScaleCheckKnowledgeSession().setGlobal("laReset", loadAverageReset);
- getScaleCheckKnowledgeSession().setGlobal("lbRef", lbReferenceType);
+// getScaleCheckKnowledgeSession().setGlobal("lbRef", lbReferenceType);
getScaleCheckKnowledgeSession().setGlobal("isPrimary", false);
getScaleCheckKnowledgeSession().setGlobal("primaryMembers", primaryMemberListInNetworkPartition);
@@ -240,17 +240,17 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
@Override
public String toString() {
return "VMServiceClusterMonitor [clusterId=" + getClusterId() +
- ", lbReferenceType=" + lbReferenceType +
+// ", lbReferenceType=" + lbReferenceType +
", hasPrimary=" + hasPrimary + " ]";
}
- public String getLbReferenceType() {
- return lbReferenceType;
- }
-
- public void setLbReferenceType(String lbReferenceType) {
- this.lbReferenceType = lbReferenceType;
- }
+// public String getLbReferenceType() {
+// return lbReferenceType;
+// }
+//
+// public void setLbReferenceType(String lbReferenceType) {
+// this.lbReferenceType = lbReferenceType;
+// }
public boolean isHasPrimary() {
return hasPrimary;