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 2014/11/03 08:32:47 UTC
[32/50] [abbrv] git commit: moving application stuff to Autoscaler
moving application stuff to Autoscaler
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/226b8709
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/226b8709
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/226b8709
Branch: refs/heads/docker-grouping-merge
Commit: 226b8709e09e91c3f2f86eb679d7f1adbb0ce108
Parents: c42d7c1
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Fri Oct 31 16:05:28 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Fri Oct 31 16:07:05 2014 +0530
----------------------------------------------------------------------
.../controller/topology/TopologyBuilder.java | 103 -------------------
.../topology/TopologyEventPublisher.java | 12 +--
.../StratosManagerTopologyEventReceiver.java | 13 +--
.../rest/endpoint/services/ServiceUtils.java | 7 +-
4 files changed, 17 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/226b8709/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
index 7ee342e..5c25297 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
@@ -655,109 +655,6 @@ public class TopologyBuilder {
}
}
- public static void handleGroupInActiveEvent(AppStatusGroupInactivateEvent event) {
- Topology topology = TopologyManager.getTopology();
- Application application = topology.getApplication(event.getAppId());
- //update the status of the Group
- if (application == null) {
- log.warn(String.format("Application %s does not exist",
- event.getAppId()));
- return;
- }
-
- Group group = application.getGroupRecursively(event.getGroupId());
- if (group == null) {
- log.warn(String.format("Group %s does not exist",
- event.getGroupId()));
- return;
- }
-
- org.apache.stratos.messaging.event.topology.GroupInactivateEvent groupInActivateEvent =
- new org.apache.stratos.messaging.event.topology.GroupInactivateEvent(
- event.getAppId(),
- event.getGroupId());
- try {
- TopologyManager.acquireWriteLock();
- group.setStatus(GroupStatus.Inactive);
- log.info("Group in-active adding status started for" + group.getUniqueIdentifier());
-
- TopologyManager.updateTopology(topology);
- } finally {
- TopologyManager.releaseWriteLock();
- }
- //publishing data
- TopologyEventPublisher.sendGroupInActiveEvent(groupInActivateEvent);
- }
-
-
- public static void handleGroupTerminatedEvent(GroupTerminatedEvent event) {
- Topology topology = TopologyManager.getTopology();
- Application application = topology.getApplication(event.getAppId());
- //update the status of the Group
- if (application == null) {
- log.warn(String.format("Application %s does not exist",
- event.getAppId()));
- return;
- }
-
- Group group = application.getGroupRecursively(event.getGroupId());
- if (group == null) {
- log.warn(String.format("Group %s does not exist",
- event.getGroupId()));
- return;
- }
-
- org.apache.stratos.messaging.event.topology.GroupTerminatedEvent groupTerminatedTopologyEvent =
- new org.apache.stratos.messaging.event.topology.GroupTerminatedEvent(
- event.getAppId(),
- event.getGroupId());
- try {
- TopologyManager.acquireWriteLock();
- group.setStatus(GroupStatus.Terminated);
- log.info("Group Terminated adding status started for" + group.getUniqueIdentifier());
-
- TopologyManager.updateTopology(topology);
- } finally {
- TopologyManager.releaseWriteLock();
- }
- //publishing data
- TopologyEventPublisher.sendGroupTerminatedEvent(groupTerminatedTopologyEvent);
- }
-
- public static void handleGroupTerminatingEvent(GroupTerminatingEvent event) {
- Topology topology = TopologyManager.getTopology();
- Application application = topology.getApplication(event.getAppId());
- //update the status of the Group
- if (application == null) {
- log.warn(String.format("Application %s does not exist",
- event.getAppId()));
- return;
- }
-
- Group group = application.getGroupRecursively(event.getGroupId());
- if (group == null) {
- log.warn(String.format("Group %s does not exist",
- event.getGroupId()));
- return;
- }
-
- org.apache.stratos.messaging.event.topology.GroupTerminatingEvent groupTerminatingTopologyEvent =
- new org.apache.stratos.messaging.event.topology.GroupTerminatingEvent(
- event.getAppId(),
- event.getGroupId());
- try {
- TopologyManager.acquireWriteLock();
- group.setStatus(GroupStatus.Terminating);
- log.info("Group Terminating adding status started for " + group.getUniqueIdentifier());
-
- TopologyManager.updateTopology(topology);
- } finally {
- TopologyManager.releaseWriteLock();
- }
- //publishing data
- TopologyEventPublisher.sendGroupTerminatingEvent(groupTerminatingTopologyEvent);
- }
-
public static void handleClusterTerminatedEvent(ClusterStatusClusterTerminatedEvent event) {
TopologyManager.acquireWriteLock();
http://git-wip-us.apache.org/repos/asf/stratos/blob/226b8709/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
index 2e0883b..eb1fb7f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
@@ -78,12 +78,12 @@ public class TopologyEventPublisher {
}
public static void sendClusterCreatedEvent(String appId, String serviceName, String clusterId) {
- ClusterCreatedEvent clusterCreatedEvent = new ClusterCreatedEvent(new Cluster());
-
- if(log.isInfoEnabled()) {
- log.info("Publishing cluster created event: " +clusterId);
- }
- publishEvent(clusterCreatedEvent);
+// ClusterCreatedEvent clusterCreatedEvent = new ClusterCreatedEvent(new Cluster());
+//
+// if(log.isInfoEnabled()) {
+// log.info("Publishing cluster created event: " +clusterId);
+// }
+// publishEvent(clusterCreatedEvent);
}
public static void sendApplicationCreatedEvent (ApplicationCreatedEvent applicationCreatedEvent) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/226b8709/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java
index a085664..d4446c4 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/receiver/StratosManagerTopologyEventReceiver.java
@@ -92,21 +92,22 @@ public class StratosManagerTopologyEventReceiver implements Runnable {
ClusterCreatedEvent clustercreatedEvent = (ClusterCreatedEvent) event;
- String serviceType = clustercreatedEvent.getServiceName();
+ String serviceType = clustercreatedEvent.getCluster().getServiceName();
//acquire read lock
//TopologyManager.acquireReadLock();
- TopologyManager.acquireReadLockForCluster(clustercreatedEvent.getServiceName(),
- clustercreatedEvent.getClusterId());
+ TopologyManager.acquireReadLockForCluster(clustercreatedEvent.getCluster().getServiceName(),
+ clustercreatedEvent.getCluster().getClusterId());
try {
- Cluster cluster = TopologyManager.getTopology().getService(serviceType).getCluster(clustercreatedEvent.getClusterId());
+ Cluster cluster = TopologyManager.getTopology().getService(serviceType).
+ getCluster(clustercreatedEvent.getCluster().getClusterId());
TopologyClusterInformationModel.getInstance().addCluster(cluster);
} finally {
//release read lock
//TopologyManager.releaseReadLock();
- TopologyManager.releaseReadLockForCluster(clustercreatedEvent.getServiceName(),
- clustercreatedEvent.getClusterId());
+ TopologyManager.releaseReadLockForCluster(clustercreatedEvent.getCluster().getServiceName(),
+ clustercreatedEvent.getCluster().getClusterId());
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/226b8709/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index 9037f33..2b99f14 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@ -54,6 +54,7 @@ import org.apache.stratos.messaging.domain.applications.Application;
import org.apache.stratos.messaging.domain.applications.ClusterDataHolder;
import org.apache.stratos.messaging.domain.applications.Group;
import org.apache.stratos.messaging.domain.topology.*;
+import org.apache.stratos.messaging.message.receiver.applications.ApplicationManager;
import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
import org.apache.stratos.messaging.util.Constants;
import org.apache.stratos.rest.endpoint.bean.ApplicationBean;
@@ -1449,8 +1450,8 @@ public class ServiceUtils {
public static ApplicationBean getApplicationInfo(String applicationId, ConfigurationContext configContext) {
ApplicationBean applicationBean = null;
try{
- TopologyManager.acquireReadLockForApplication(applicationId);
- Application application = TopologyManager.getTopology().getApplication(applicationId);
+ ApplicationManager.acquireReadLockForApplication(applicationId);
+ Application application = ApplicationManager.getApplications().getApplication(applicationId);
if(application == null){
return null;
}
@@ -1480,7 +1481,7 @@ public class ServiceUtils {
applicationBean.addGroup(groupBean);
}
}finally {
- TopologyManager.releaseReadLockForApplication(applicationId);
+ ApplicationManager.releaseReadLockForApplication(applicationId);
}