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/13 04:00:13 UTC
[3/3] stratos git commit: Change the exception handling class to
client class
Change the exception handling class to client class
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7a878347
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7a878347
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7a878347
Branch: refs/heads/master
Commit: 7a878347cfca0a305bfe353ec3982fef4ebce8d3
Parents: 03de831
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Jun 12 18:05:00 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Jun 13 07:29:50 2015 +0530
----------------------------------------------------------------------
.../partition/ClusterLevelPartitionContext.java | 28 +++++++++-----------
.../client/CloudControllerServiceClient.java | 10 +++++--
2 files changed, 20 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7a878347/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 875fa1a..4767ec8 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
@@ -716,23 +716,19 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se
"[cluster instance] %s",
obsoleteMemberId, obsoletedMemberExpiryTime, obsoleteMember.getClusterId(),
obsoleteMember.getClusterInstanceId()));
- try {
- //notifying CC, about the removal of obsolete member
- CloudControllerServiceClient.getInstance().removeExpiredObsoledMemberFromCloudController(
- obsoleteMember);
- iterator.remove();
- if (ctxt.getMemberStatsContexts().containsKey(obsoleteMemberId)) {
- ctxt.getMemberStatsContexts().remove(obsoleteMemberId);
- }
- log.info(String.format("Obsolete member is removed from autoscaler and cloud controller " +
- "[obsolete member] %s [cluster] %s " +
- "[cluster instance] %s",
- obsoleteMemberId, obsoleteMember.getClusterId(),
- obsoleteMember.getClusterInstanceId()));
- } catch (RemoteException e) {
- log.error(String.format("Error while removing member from cloud controller for obsolete " +
- "member, [member-id] %s ", obsoleteMemberId));
+
+ //notifying CC, about the removal of obsolete member
+ CloudControllerServiceClient.getInstance().removeExpiredObsoledMemberFromCloudController(
+ obsoleteMember);
+ iterator.remove();
+ if (ctxt.getMemberStatsContexts().containsKey(obsoleteMemberId)) {
+ ctxt.getMemberStatsContexts().remove(obsoleteMemberId);
}
+ log.info(String.format("Obsolete member is removed from autoscaler and cloud controller " +
+ "[obsolete member] %s [cluster] %s " +
+ "[cluster instance] %s",
+ obsoleteMemberId, obsoleteMember.getClusterId(),
+ obsoleteMember.getClusterInstanceId()));
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7a878347/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 cdb7337..0119f03 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,13 @@ public class CloudControllerServiceClient {
}
}
- public void removeExpiredObsoledMemberFromCloudController(MemberContext member) throws RemoteException {
- stub.removeExpiredObsoledMemberFromCloudController(member);
+ public void removeExpiredObsoledMemberFromCloudController(MemberContext member) {
+ try {
+
+ stub.removeExpiredObsoledMemberFromCloudController(member);
+ } catch (RemoteException e) {
+ log.error(String.format("Error while removing member from cloud controller for obsolete " +
+ "member, [member-id] %s ", member.getMemberId()));
+ }
}
}