Repository: stratos Updated Branches: refs/heads/master 80a737142 -> 501694476
Fix STRATOS-1660 - Obsolete timeout calculation logic should handle CREATED and faulty members separately Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f1e00451 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f1e00451 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f1e00451 Branch: refs/heads/master Commit: f1e004517b2486d8e90ce6f4a7493beb5a2d0707 Parents: 80a7371 Author: Akila Perera <[email protected]> Authored: Thu Jun 16 10:11:50 2016 +0530 Committer: Akila Perera <[email protected]> Committed: Thu Jun 16 10:11:50 2016 +0530 ---------------------------------------------------------------------- .../context/partition/ClusterLevelPartitionContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f1e00451/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 cd71f77..fee8746 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 @@ -747,7 +747,9 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se if (obsoleteMember == null) { continue; } - long obsoleteTime = System.currentTimeMillis() - obsoleteMember.getInitTime(); + long obsoleteStartTime = (obsoleteMember.getObsoleteInitTime() == 0) ? + obsoleteMember.getInitTime() : obsoleteMember.getObsoleteInitTime(); + long obsoleteTime = System.currentTimeMillis() - obsoleteStartTime; if (obsoleteTime >= obsoletedMemberExpiryTime) { String obsoleteMemberId = obsoleteMember.getMemberId();
