Repository: stratos Updated Branches: refs/heads/master 652871201 -> 55e49d0f8
Adding a nullcheck and formatting Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2515de57 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2515de57 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2515de57 Branch: refs/heads/master Commit: 2515de57c38c5bffc4b7ab64946c0fad76207233 Parents: 6528712 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Jun 11 14:19:28 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Jun 11 14:19:28 2015 +0530 ---------------------------------------------------------------------- .../context/partition/ClusterLevelPartitionContext.java | 11 +++++++---- .../topology/AutoscalerTopologyEventReceiver.java | 3 ++- .../autoscaler/services/impl/AutoscalerServiceImpl.java | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2515de57/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 858a827..6a050fa 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 @@ -712,25 +712,28 @@ public class ClusterLevelPartitionContext extends PartitionContext implements Se long obsoleteTime = System.currentTimeMillis() - obsoleteMember.getInitTime(); if (obsoleteTime >= obsoletedMemberExpiryTime) { + String obsoleteMemberId = obsoleteMember.getMemberId(); log.info(String.format("Obsolete state of member is expired, member will be disposed and will " + "not be tracked anymore [obsolete member] %s [expiry time] %s [cluster] %s " + "[cluster instance] %s", - obsoleteMember.getMemberId(), obsoletedMemberExpiryTime, obsoleteMember.getClusterId(), + obsoleteMemberId, obsoletedMemberExpiryTime, obsoleteMember.getClusterId(), obsoleteMember.getClusterInstanceId())); try { //notifying CC, about the removal of obsolete member CloudControllerServiceClient.getInstance().removeExpiredObsoledMemberFromCloudController( obsoleteMember); iterator.remove(); - memberStatsContexts.remove(obsoleteMember.getMemberId()); + if (memberStatsContexts.containsKey(obsoleteMemberId)) { + memberStatsContexts.remove(obsoleteMemberId); + } log.info(String.format("Obsolete member is removed from autoscaler and cloud controller " + "[obsolete member] %s [cluster] %s " + "[cluster instance] %s", - obsoleteMember.getMemberId(), obsoleteMember.getClusterId(), + 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 ", obsoleteMember.getMemberId())); + "member, [member-id] %s ", obsoleteMemberId)); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2515de57/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java index 116e5ea..dd034cc 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java @@ -93,7 +93,8 @@ public class AutoscalerTopologyEventReceiver { if (AutoscalerUtil.allClustersInitialized(application)) { ApplicationContext applicationContext = AutoscalerContext.getInstance(). getApplicationContext(application.getUniqueIdentifier()); - if (applicationContext != null && applicationContext.getStatus().equals(ApplicationContext.STATUS_DEPLOYED)) { + if (applicationContext != null && applicationContext.getStatus().equals( + ApplicationContext.STATUS_DEPLOYED)) { AutoscalerUtil.getInstance().startApplicationMonitor(application.getUniqueIdentifier()); } else { log.info("The application is not yet " + http://git-wip-us.apache.org/repos/asf/stratos/blob/2515de57/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index eed70b7..54323e7 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -1190,6 +1190,7 @@ public class AutoscalerServiceImpl implements AutoscalerService { clusterLevelPartitionContext.movePendingMemberToObsoleteMembers( memberContextIterator.next().getMemberId()); + } } }
