You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2016/06/17 10:32:12 UTC
[1/2] stratos git commit: Fix obsolete expiry timeout calculation
logic
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 <ra...@gmail.com>
Authored: Fri Jun 17 15:15:23 2016 +0530
Committer: Akila Perera <ra...@gmail.com>
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();
[2/2] stratos git commit: Remove duplicate dependency
Posted by ra...@apache.org.
Remove duplicate dependency
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2dd7a367
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2dd7a367
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2dd7a367
Branch: refs/heads/stratos-4.1.x
Commit: 2dd7a36767d51a849c260cb415fef1124a27dfa9
Parents: 873df2e
Author: Akila Perera <ra...@gmail.com>
Authored: Fri Jun 17 15:18:13 2016 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Fri Jun 17 15:18:13 2016 +0530
----------------------------------------------------------------------
pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2dd7a367/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d1755d6..642c0a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1108,11 +1108,6 @@
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cep300.extension</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.metadata.client</artifactId>
<version>${project.version}</version>
</dependency>