You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/28 21:51:02 UTC
[1/2] stratos git commit: add member status logs to
assertClusterActivation
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 90b030a6e -> 8a36db5fd
add member status logs to assertClusterActivation
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dee118bd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dee118bd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dee118bd
Branch: refs/heads/stratos-4.1.x
Commit: dee118bdf22d909eaf12004e2820ee1cbd2c2b4f
Parents: 90b030a
Author: Akila Perera <ra...@gmail.com>
Authored: Sat Aug 29 00:45:16 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Aug 29 00:45:16 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/integration/tests/TopologyHandler.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/dee118bd/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
index a0aea77..3a1e6c6 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java
@@ -225,9 +225,10 @@ public class TopologyHandler {
assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s",
applicationName, serviceName, clusterId), cluster);
for (Member member : cluster.getMembers()) {
- log.info(String.format("Member [member-id] %s found in cluster instance [cluster-instance] %s of " +
- "cluster [cluster-id] %s", member
- .getMemberId(), member.getClusterInstanceId(), member.getClusterId()));
+ log.info(String.format(
+ "Member [member-id] %s in [status] %s found in [cluster-instance] %s of [cluster-id] %s",
+ member.getMemberId(), member.getStatus(), member.getClusterInstanceId(),
+ member.getClusterId()));
}
boolean clusterActive = false;
int activeInstances;
[2/2] stratos git commit: Fixes STRATOS-1532: Kub cluster update
Posted by ra...@apache.org.
Fixes STRATOS-1532: Kub cluster update
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8a36db5f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8a36db5f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8a36db5f
Branch: refs/heads/stratos-4.1.x
Commit: 8a36db5fdbc25113b4ac2d4b67f0dbb0a2c6dadc
Parents: dee118b
Author: Akila Perera <ra...@gmail.com>
Authored: Sat Aug 29 01:20:37 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Aug 29 01:20:37 2015 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/context/CloudControllerContext.java | 4 ++++
.../controller/services/impl/CloudControllerServiceImpl.java | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8a36db5f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index 708a24b..964dd73 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -512,6 +512,10 @@ public class CloudControllerContext implements Serializable {
kubernetesClusterContext.getKubernetesClusterId(), kubernetesClusterContext);
}
+ public void removeKubernetesClusterContext(String kubernetesClusterId){
+ kubClusterIdToKubClusterContextMap.remove(kubernetesClusterId);
+ }
+
/**
* Remove a registered Kubernetes cluster from registry
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/8a36db5f/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 55e70db..f1615c5 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
@@ -1305,6 +1305,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
// Remove entry from information model
CloudControllerContext.getInstance().removeKubernetesCluster(kubernetesClusterId);
+ CloudControllerContext.getInstance().removeKubernetesClusterContext(kubernetesClusterId);
if (log.isInfoEnabled()) {
log.info(String.format("Kubernetes cluster removed successfully: [id] %s", kubernetesClusterId));