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/02/23 07:28:55 UTC
stratos git commit: adding more informative logs and fixing typo,
s/obsoltedMemberExpiryTime/obsoletedMemberExpiryTime
Repository: stratos
Updated Branches:
refs/heads/master 11f3e0063 -> 427c053f8
adding more informative logs and fixing typo, s/obsoltedMemberExpiryTime/obsoletedMemberExpiryTime
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/427c053f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/427c053f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/427c053f
Branch: refs/heads/master
Commit: 427c053f8773344249555257d9a58221b7d7049a
Parents: 11f3e00
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Feb 23 11:58:35 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Feb 23 11:58:42 2015 +0530
----------------------------------------------------------------------
.../partition/ClusterLevelPartitionContext.java | 28 ++++++++++++++++----
1 file changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/427c053f/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
index 0287f5a..b2e7388 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/ClusterLevelPartitionContext.java
@@ -590,6 +590,7 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
private class PendingMemberWatcher implements Runnable {
private ClusterLevelPartitionContext ctxt;
+ private final Log log = LogFactory.getLog(PendingMemberWatcher.class);
public PendingMemberWatcher(ClusterLevelPartitionContext ctxt) {
this.ctxt = ctxt;
@@ -599,6 +600,7 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
public void run() {
while (true) {
+
long expiryTime = ctxt.getPendingMemberExpiryTime();
List<MemberContext> pendingMembers = ctxt.getPendingMembers();
@@ -615,8 +617,10 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
iterator.remove();
- log.info("Pending state of member: " + pendingMember.getMemberId() +
- " is expired. " + "Adding as an obsoleted member.");
+ log.info(String.format("Pending state of member expired, adding as an obsoleted member. " +
+ "[pending member] %s [expiry time] %s [cluster] %s " + "[cluster instance] %s",
+ pendingMember.getMemberId(), expiryTime, pendingMember.getClusterId(),
+ pendingMember.getClusterInstanceId()));
// member should be terminated
ctxt.addObsoleteMember(pendingMember);
pendingMembersFailureCount++;
@@ -640,6 +644,7 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
private class ObsoletedMemberWatcher implements Runnable {
private ClusterLevelPartitionContext ctxt;
+ private final Log log = LogFactory.getLog(ObsoletedMemberWatcher.class);
public ObsoletedMemberWatcher(ClusterLevelPartitionContext ctxt) {
this.ctxt = ctxt;
@@ -648,7 +653,8 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
@Override
public void run() {
while (true) {
- long obsoltedMemberExpiryTime = ctxt.getObsoltedMemberExpiryTime();
+
+ long obsoletedMemberExpiryTime = ctxt.getObsoltedMemberExpiryTime();
Map<String, MemberContext> obsoletedMembers = ctxt.getObsoletedMembers();
Iterator<Entry<String, MemberContext>> iterator = obsoletedMembers.entrySet().iterator();
@@ -659,7 +665,13 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
continue;
}
long obsoleteTime = System.currentTimeMillis() - obsoleteMember.getInitTime();
- if (obsoleteTime >= obsoltedMemberExpiryTime) {
+ if (obsoleteTime >= obsoletedMemberExpiryTime) {
+
+ log.info(String.format("Obsolete state of member is expired, member will be disposed and will " +
+ "not be tracked anymore [obsolete member] %s [expiry time] %s [cluster] %s " +
+ "[cluster instance] %s",
+ obsoleteMember.getMemberId(), obsoletedMemberExpiryTime, obsoleteMember.getClusterId(),
+ obsoleteMember.getClusterInstanceId()));
iterator.remove();
}
}
@@ -677,6 +689,7 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
*/
private class TerminationPendingMemberWatcher implements Runnable {
private ClusterLevelPartitionContext ctxt;
+ private final Log log = LogFactory.getLog(TerminationPendingMemberWatcher.class);
public TerminationPendingMemberWatcher(ClusterLevelPartitionContext ctxt) {
this.ctxt = ctxt;
@@ -698,7 +711,12 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
long terminationPendingTime = System.currentTimeMillis()
- ctxt.getTerminationPendingStartedTimeOfMember(terminationPendingMember.getMemberId());
if (terminationPendingTime >= terminationPendingMemberExpiryTime) {
- log.info("Moving [member] " + terminationPendingMember.getMemberId() + partitionId);
+
+ log.info(String.format("Termination pending state of member is expired, member will be moved to " +
+ "obsolete list [termination pending member] %s [expiry time] %s [cluster] %s " +
+ "[cluster instance] %s",
+ terminationPendingMember.getMemberId(), terminationPendingMemberExpiryTime,
+ terminationPendingMember.getClusterId(), terminationPendingMember.getClusterInstanceId()));
iterator.remove();
obsoletedMembers.put(terminationPendingMember.getMemberId(), terminationPendingMember);
}