Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 4b04a518a -> 2dd7a3676
Fix obsolete expiry timeout calculation logic Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/873df2ec Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/873df2ec Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/873df2ec Branch: refs/heads/stratos-4.1.x Commit: 873df2ec5255ef067abf1dfb4ef2ba479fc63b8e Parents: 4b04a51 Author: Akila Perera <[email protected]> Authored: Fri Jun 17 15:15:23 2016 +0530 Committer: Akila Perera <[email protected]> Committed: Fri Jun 17 15:15:23 2016 +0530 ---------------------------------------------------------------------- .../context/partition/ClusterLevelPartitionContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/873df2ec/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();
