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/06/11 04:44:29 UTC
[4/5] stratos git commit:
s/removeFromCloudController/removeExpiredObsoledMemberFromCloudController in
client side
s/removeFromCloudController/removeExpiredObsoledMemberFromCloudController in client side
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d9df355
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d9df355
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d9df355
Branch: refs/heads/master
Commit: 6d9df3559e18d371c423d43ab401ddfff8b67b43
Parents: e5b5c5d
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Jun 11 07:59:06 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Jun 11 07:59:06 2015 +0530
----------------------------------------------------------------------
.../context/partition/ClusterLevelPartitionContext.java | 3 ++-
.../stratos/common/client/CloudControllerServiceClient.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d9df355/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 797f38c..2155022 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
@@ -719,7 +719,8 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
obsoleteMember.getClusterInstanceId()));
try {
//notifying CC, about the removal of obsolete member
- CloudControllerServiceClient.getInstance().removeMemberFromCloudController(obsoleteMember);
+ CloudControllerServiceClient.getInstance().removeExpiredObsoledMemberFromCloudController(
+ obsoleteMember);
iterator.remove();
log.info(String.format("Obsolete member is removed from autoscaler and cloud controller " +
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d9df355/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
index 83dc986..cdb7337 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
@@ -264,7 +264,7 @@ public class CloudControllerServiceClient {
}
}
- public void removeMemberFromCloudController(MemberContext member) throws RemoteException {
- stub.removeMemberFromCloudController(member);
+ public void removeExpiredObsoledMemberFromCloudController(MemberContext member) throws RemoteException {
+ stub.removeExpiredObsoledMemberFromCloudController(member);
}
}