You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/03/22 16:05:55 UTC
stratos git commit: Changing logic to publish initial complete
topology event once stratos manager becomes active
Repository: stratos
Updated Branches:
refs/heads/master e66a2d2ad -> f13f66313
Changing logic to publish initial complete topology event once stratos manager becomes active
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f13f6631
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f13f6631
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f13f6631
Branch: refs/heads/master
Commit: f13f66313a7a6a0a88baf952c69c8b523b325077
Parents: e66a2d2
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Mar 22 20:35:33 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Mar 22 20:35:33 2015 +0530
----------------------------------------------------------------------
.../controller/internal/CloudControllerServiceComponent.java | 3 +--
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 1 -
.../stratos/integration/tests/StratosTestServerManager.java | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f13f6631/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
index 335ed61..bf8e92c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
@@ -167,8 +167,7 @@ public class CloudControllerServiceComponent {
componentStartUpSynchronizer.addEventListener(new ComponentActivationEventListener() {
@Override
public void activated(Component component) {
- if(component == Component.Autoscaler) {
- // Execute topology synchronizer at the server startup
+ if(component == Component.StratosManager) {
TopologySynchronizerTask topologySynchronizerTask = new TopologySynchronizerTask();
topologySynchronizerTask.execute();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f13f6631/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 4c53f53..80a409a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -1384,7 +1384,6 @@ public class StratosApiV41Utils {
addClustersInstancesToApplicationInstanceBean(instanceBean, application);
addGroupsInstancesToApplicationInstanceBean(instanceBean, application);
}
-
} finally {
ApplicationManager.releaseReadLockForApplication(applicationId);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f13f6631/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 674ac6f..ec9afeb 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -140,7 +140,7 @@ public class StratosTestServerManager extends TestServerManager {
private boolean serverStarted(TestLogAppender testLogAppender) {
for(String message : testLogAppender.getMessages()) {
- if(message.contains("StratosManager component became active")) {
+ if(message.contains("Topology initialized")) {
return true;
}
}