You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/10/10 17:00:47 UTC
[1/2] git commit: If the member context is already there,
stop executing 'on Pod activated' logic.
Repository: stratos
Updated Branches:
refs/heads/container-autoscaling f37ece08b -> 6b87cca59
If the member context is already there, stop executing 'on Pod activated' logic.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6d88c6d4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6d88c6d4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6d88c6d4
Branch: refs/heads/container-autoscaling
Commit: 6d88c6d4a83841f77320437fa3f0cd685534c899
Parents: f37ece0
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Fri Oct 10 20:29:56 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Fri Oct 10 20:29:56 2014 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/util/PodActivationWatcher.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6d88c6d4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java
index 13d1ac6..672cfeb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/PodActivationWatcher.java
@@ -48,20 +48,21 @@ public class PodActivationWatcher implements Runnable {
@Override
public void run() {
try {
+ FasterLookUpDataHolder dataHolder = FasterLookUpDataHolder.getInstance();
Pod pod = kubApi.getPod(podId);
if (LOG.isDebugEnabled()) {
LOG.debug("PodActivationWatcher running : "+pod.getCurrentState().getStatus());
}
- if ("Running".equals(pod.getCurrentState().getStatus())) {
+ if ("Running".equals(pod.getCurrentState().getStatus()) && dataHolder.getMemberContextOfMemberId(podId) == null) {
String hostIP = pod.getCurrentState().getHost();
ctxt.setPublicIpAddress(hostIP);
ctxt.setPrivateIpAddress(hostIP);
- FasterLookUpDataHolder.getInstance().addMemberContext(ctxt);
+ dataHolder.addMemberContext(ctxt);
// trigger topology
TopologyBuilder.handleMemberSpawned(ctxt.getCartridgeType(), ctxt.getClusterId(),
null, hostIP, hostIP, ctxt);
- RegistryManager.getInstance().persist(FasterLookUpDataHolder.getInstance());
+ RegistryManager.getInstance().persist(dataHolder);
}
[2/2] git commit: Handling NPE in docker case.
Posted by ni...@apache.org.
Handling NPE in docker case.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6b87cca5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6b87cca5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6b87cca5
Branch: refs/heads/container-autoscaling
Commit: 6b87cca59aa16fc773c89ece71d29c3d7bf536e6
Parents: 6d88c6d
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Fri Oct 10 20:30:21 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Fri Oct 10 20:30:21 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/impl/CloudControllerServiceImpl.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6b87cca5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 25e19ce..5acb86c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -866,14 +866,20 @@ public class CloudControllerServiceImpl implements CloudControllerService {
private void logTermination(MemberContext memberContext) {
+ if (memberContext == null) {
+ return;
+ }
+
+ String partitionId = memberContext.getPartition() == null ? null : memberContext.getPartition().getId();
+
//updating the topology
TopologyBuilder.handleMemberTerminated(memberContext.getCartridgeType(),
memberContext.getClusterId(), memberContext.getNetworkPartitionId(),
- memberContext.getPartition().getId(), memberContext.getMemberId());
+ partitionId, memberContext.getMemberId());
//publishing data
CartridgeInstanceDataPublisher.publish(memberContext.getMemberId(),
- memberContext.getPartition().getId(),
+ partitionId,
memberContext.getNetworkPartitionId(),
memberContext.getClusterId(),
memberContext.getCartridgeType(),