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/02/26 14:30:21 UTC
[2/2] stratos git commit: Fixing member context not found issues,
STRATOS-1110
Fixing member context not found issues, STRATOS-1110
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/85b1b993
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/85b1b993
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/85b1b993
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: 85b1b993e6bba5e0e545f41d9adbe9fa0647138a
Parents: 8ffa01a
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Feb 26 18:59:09 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Feb 26 19:00:10 2015 +0530
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 44 --------------------
1 file changed, 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/85b1b993/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 5518aaa..3f17439 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
@@ -583,11 +583,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
if (cluster != null) {
Member member = cluster.getMember(memberId);
if (member != null) {
- // change member status if termination on a faulty member
- if (fixMemberStatus(member, topology)) {
- // set the time this member was added to ReadyToShutdown status
- memberContext.setObsoleteInitTime(System.currentTimeMillis());
- }
// check if ready to shutdown member is expired and send
// member terminated if it is.
@@ -643,45 +638,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
return false;
}
-
- /**
- * Corrects the member status upon termination call if the member is in an Active state
- *
- * @param member The {@link org.apache.stratos.messaging.domain.topology.Member} object that is being
- * checked for status
- * @param topology The {@link org.apache.stratos.messaging.domain.topology.Topology} object to update
- * the topology if needed.
- */
- private boolean fixMemberStatus(Member member, Topology topology) {
- if (member.getStatus() == MemberStatus.Active) {
- MemberReadyToShutdownEvent memberReadyToShutdownEvent = new MemberReadyToShutdownEvent(
- member.getServiceName(),
- member.getClusterId(),
- member.getClusterInstanceId(), member.getMemberId(),
- member.getNetworkPartitionId(),
- member.getPartitionId());
-
- member.setStatus(MemberStatus.ReadyToShutDown);
- log.info("Member Ready to shut down event adding status started");
-
- TopologyManager.updateTopology(topology);
-
- TopologyEventPublisher.sendMemberReadyToShutdownEvent(memberReadyToShutdownEvent);
- //publishing data
- StatisticsDataPublisher.publish(member.getMemberId(),
- member.getPartitionId(),
- member.getNetworkPartitionId(),
- member.getClusterId(),
- member.getServiceName(),
- MemberStatus.ReadyToShutDown.toString(),
- null);
-
- return true;
- }
-
- return false;
- }
-
@Override
public void terminateInstances(String clusterId) throws InvalidClusterException {