s/removeExpiredObsoledMemberFromCloudController/removeExpiredObsoletedMemberFromCloudController
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d156244 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d156244 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d156244 Branch: refs/heads/master Commit: 6d156244217754648911447cccdd19a3429562b5 Parents: 7a87834 Author: Lahiru Sandaruwan <[email protected]> Authored: Sat Jun 13 07:29:44 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sat Jun 13 07:29:50 2015 +0530 ---------------------------------------------------------------------- .../partition/ClusterLevelPartitionContext.java | 10 +- .../services/CloudControllerService.java | 2 +- .../impl/CloudControllerServiceImpl.java | 2 +- .../client/CloudControllerServiceClient.java | 4 +- .../main/resources/CloudControllerService.wsdl | 826 +++++++++---------- 5 files changed, 425 insertions(+), 419 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6d156244/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 4767ec8..9464060 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 @@ -18,6 +18,7 @@ */ package org.apache.stratos.autoscaler.context.partition; +import org.apache.axis2.AxisFault; import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -718,8 +719,13 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se obsoleteMember.getClusterInstanceId())); //notifying CC, about the removal of obsolete member - CloudControllerServiceClient.getInstance().removeExpiredObsoledMemberFromCloudController( - obsoleteMember); + try { + CloudControllerServiceClient.getInstance().removeExpiredObsoletedMemberFromCloudController( + obsoleteMember); + } catch (AxisFault axisFault) { + log.error(String.format("Error while removing member from cloud controller for obsolete " + + "member, [member-id] %s ", obsoleteMemberId)); + } iterator.remove(); if (ctxt.getMemberStatsContexts().containsKey(obsoleteMemberId)) { ctxt.getMemberStatsContexts().remove(obsoleteMemberId); http://git-wip-us.apache.org/repos/asf/stratos/blob/6d156244/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java index 1c954ef..b113329 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java @@ -393,5 +393,5 @@ public interface CloudControllerService { * Remove member from cloud controller side context, topology etc. * @param member member to be removed */ - void removeExpiredObsoledMemberFromCloudController(MemberContext member); + void removeExpiredObsoletedMemberFromCloudController(MemberContext member); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/6d156244/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 58b644d..7d2d891 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -1610,7 +1610,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public void removeExpiredObsoledMemberFromCloudController(MemberContext member) { + public void removeExpiredObsoletedMemberFromCloudController(MemberContext member) { CloudControllerServiceUtil.executeMemberTerminationPostProcess(member); http://git-wip-us.apache.org/repos/asf/stratos/blob/6d156244/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 0119f03..ad37f2b 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,10 +264,10 @@ public class CloudControllerServiceClient { } } - public void removeExpiredObsoledMemberFromCloudController(MemberContext member) { + public void removeExpiredObsoletedMemberFromCloudController(MemberContext member) { try { - stub.removeExpiredObsoledMemberFromCloudController(member); + stub.removeExpiredObsoletedMemberFromCloudController(member); } catch (RemoteException e) { log.error(String.format("Error while removing member from cloud controller for obsolete " + "member, [member-id] %s ", member.getMemberId()));
