Updated Branches: refs/heads/master 47750cded -> df1e7fd1a
Adding a bool to check whether the cluster is a LB cluster at cluster removed event Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/66e27b27 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/66e27b27 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/66e27b27 Branch: refs/heads/master Commit: 66e27b27683fc543b291e0562b136f86e6c25052 Parents: d055f52 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Jan 9 17:16:08 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Jan 9 17:16:08 2014 +0530 ---------------------------------------------------------------------- .../receiver/topology/AutoscalerTopologyReceiver.java | 2 +- .../apache/stratos/cartridge/agent/CartridgeAgent.java | 9 ++++----- .../stratos/cloud/controller/pojo/ClusterContext.java | 10 ++-------- .../cloud/controller/topology/TopologyEventPublisher.java | 3 ++- .../messaging/event/topology/ClusterRemovedEvent.java | 8 +++++++- 5 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66e27b27/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java index cff8e1d..6aa34df 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java @@ -147,7 +147,7 @@ public class AutoscalerTopologyReceiver implements Runnable { String clusterId = e.getClusterId(); AbstractMonitor monitor; - if(TopologyManager.getTopology().getService(serviceName).getCluster(clusterId).isLbCluster()){ + if(e.isLbCluster()){ monitor = AutoscalerContext.getInstance().removeLbMonitor(clusterId); } else { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66e27b27/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index 0b1091a..76bfee4 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -39,7 +39,7 @@ public class CartridgeAgent implements Runnable { if(log.isErrorEnabled()){ log.error(String.format("System property not found: %s", CartridgeAgentConstants.JNDI_PROPERTIES_DIR)); } - throw new RuntimeException(String.format("System property not found: %s", CartridgeAgentConstants.JNDI_PROPERTIES_DIR)); + return; } String payloadPath = System.getProperty(CartridgeAgentConstants.PARAM_FILE_PATH); @@ -47,15 +47,14 @@ public class CartridgeAgent implements Runnable { if(log.isErrorEnabled()){ log.error(String.format("System property not found: %s", CartridgeAgentConstants.PARAM_FILE_PATH)); } - throw new RuntimeException(String.format("System property not found: %s", CartridgeAgentConstants.PARAM_FILE_PATH)); + return; } String extensionsDir = System.getProperty(CartridgeAgentConstants.EXTENSIONS_DIR); if(StringUtils.isBlank(extensionsDir)) { - if(log.isErrorEnabled()){ - log.error(String.format("System property not found: %s", CartridgeAgentConstants.EXTENSIONS_DIR)); + if(log.isWarnEnabled()){ + log.warn(String.format("System property not found: %s", CartridgeAgentConstants.EXTENSIONS_DIR)); } - throw new RuntimeException(String.format("System property not found: %s", CartridgeAgentConstants.EXTENSIONS_DIR)); } // Start instance notifier listener thread http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66e27b27/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ClusterContext.java index 01cef44..b4f7a70 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/ClusterContext.java @@ -35,13 +35,7 @@ public class ClusterContext implements Serializable{ // payload as a String private String payload; private String hostName; - - public ClusterContext(String clusterId, String cartridgeType, String payload) { - this.clusterId = clusterId; - this.cartridgeType = cartridgeType; - this.payload = payload; - } - + public ClusterContext(String clusterId, String cartridgeType, String payload, String hostName) { this.clusterId = clusterId; this.cartridgeType = cartridgeType; @@ -75,5 +69,5 @@ public class ClusterContext implements Serializable{ public void setHostName(String hostName) { this.hostName = hostName; } - + } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66e27b27/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 99378c2..d88aa47 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 @@ -85,7 +85,8 @@ public class TopologyEventPublisher { } public static void sendClusterRemovedEvent(ClusterContext ctxt) { - ClusterRemovedEvent clusterRemovedEvent = new ClusterRemovedEvent(ctxt.getCartridgeType(), ctxt.getClusterId()); + + ClusterRemovedEvent clusterRemovedEvent = new ClusterRemovedEvent(ctxt.getCartridgeType(), ctxt.getClusterId(), false); if(log.isInfoEnabled()) { log.info(String.format("Publishing cluster removed event: [service] %s [cluster] %s", ctxt.getCartridgeType(), ctxt.getClusterId())); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66e27b27/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java index 79fa15f..1fb57a8 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java @@ -29,10 +29,12 @@ public class ClusterRemovedEvent extends TopologyEvent implements Serializable { private final String serviceName; private final String clusterId; + private final boolean isLbCluster; - public ClusterRemovedEvent(String serviceName, String clusterId) { + public ClusterRemovedEvent(String serviceName, String clusterId, boolean isLbCluster) { this.serviceName = serviceName; this.clusterId = clusterId; + this.isLbCluster = isLbCluster; } public String getServiceName() { @@ -42,4 +44,8 @@ public class ClusterRemovedEvent extends TopologyEvent implements Serializable { public String getClusterId() { return clusterId; } + + public boolean isLbCluster() { + return isLbCluster; + } }
