You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/08/28 11:57:49 UTC
[18/50] [abbrv] git commit: Removing unused variables and cleaning up
the code.
Removing unused variables and cleaning up the code.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/62a92caf
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/62a92caf
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/62a92caf
Branch: refs/heads/4.0.0-grouping
Commit: 62a92cafbbe9d991292ce359fddea3c919f98f9c
Parents: 5a5e7bd
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Wed Aug 20 08:38:29 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Wed Aug 20 08:38:29 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/AutoscalerContext.java | 2 --
.../autoscaler/NetworkPartitionContext.java | 3 +-
.../stratos/autoscaler/PartitionContext.java | 32 --------------------
3 files changed, 1 insertion(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/62a92caf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java
index 8bfb8e6..c49d582 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java
@@ -32,8 +32,6 @@ import java.util.Map;
* This class is there for accumulating cluster details which are not there in Topology
*/
public class AutoscalerContext {
- private static volatile AutoscalerContext instance;
-// Map<String, ClusterContext> clusterContextMap;
private static final Log log = LogFactory.getLog(AutoscalerContext.class);
private AutoscalerContext() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/62a92caf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
index bb9bd60..0b75c49 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
@@ -38,7 +38,6 @@ public class NetworkPartitionContext implements Serializable{
private static final Log log = LogFactory.getLog(NetworkPartitionContext.class);
private static final long serialVersionUID = 572769304374110159L;
private final String id;
- private boolean scaleDownAllowed = false;
private int scaleDownWaitCount = 5; //TODO get from a config
private int scaleDownRequestsCount = 0;
@@ -193,7 +192,7 @@ public class NetworkPartitionContext implements Serializable{
final int prime = 31;
int result = 1;
- result = 31 * result + ((this.id == null) ? 0 : this.id.hashCode());
+ result = prime * result + ((this.id == null) ? 0 : this.id.hashCode());
return result;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/62a92caf/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
index 1def03c..3c309dc 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java
@@ -50,7 +50,6 @@ public class PartitionContext implements Serializable{
private String serviceName;
private String networkPartitionId;
private Partition partition;
-// private int currentActiveMemberCount = 0;
private int minimumMemberCount = 0;
private int pendingMembersFailureCount = 0;
private final int PENDING_MEMBER_FAILURE_THRESHOLD = 5;
@@ -66,9 +65,6 @@ public class PartitionContext implements Serializable{
// members to be terminated
private List<String> obsoletedMembers;
- // Contains the members that CEP notified as faulty members.
-// private List<String> faultyMembers;
-
// active members
private List<MemberContext> activeMembers;
@@ -77,8 +73,6 @@ public class PartitionContext implements Serializable{
//Keep statistics come from CEP
private Map<String, MemberStatsContext> memberStatsContexts;
- private int nonTerminatedMemberCount;
-// private int totalMemberCount;
// for the use of tests
public PartitionContext(long memberExpiryTime) {
@@ -96,7 +90,6 @@ public class PartitionContext implements Serializable{
this.activeMembers = new ArrayList<MemberContext>();
this.terminationPendingMembers = new ArrayList<MemberContext>();
this.obsoletedMembers = new CopyOnWriteArrayList<String>();
-// this.faultyMembers = new CopyOnWriteArrayList<String>();
memberStatsContexts = new ConcurrentHashMap<String, MemberStatsContext>();
// check if a different value has been set for expiryTime
@@ -132,19 +125,6 @@ public class PartitionContext implements Serializable{
public void setPartitionId(String partitionId) {
this.partitionId = partitionId;
}
-// public int getTotalMemberCount() {
-// // live count + pending count
-// return currentActiveMemberCount + pendingMembers.size();
-// }
-
-// public void incrementCurrentActiveMemberCount(int count) {
-//
-// this.currentActiveMemberCount += count;
-// }
-
-// public void decrementCurrentActiveMemberCount(int count) {
-// this.currentActiveMemberCount -= count;
-// }
public int getMinimumMemberCount() {
return minimumMemberCount;
@@ -263,18 +243,6 @@ public class PartitionContext implements Serializable{
public boolean removeObsoleteMember(String memberId) {
return this.obsoletedMembers.remove(memberId);
}
-//
-// public void addFaultyMember(String memberId) {
-// this.faultyMembers.add(memberId);
-// }
-//
-// public boolean removeFaultyMember(String memberId) {
-// return this.faultyMembers.remove(memberId);
-// }
-//
-// public List<String> getFaultyMembers() {
-// return this.faultyMembers;
-// }
public long getExpiryTime() {
return expiryTime;