Updated Branches: refs/heads/master 419a460dc -> 9cbad2329
Refacter to new cluster context Added debug logs Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b7d5e7ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b7d5e7ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b7d5e7ef Branch: refs/heads/master Commit: b7d5e7ef20d2864f93175040da43d3b1c1ce3fe2 Parents: 7c51d04 Author: Udara Liyanage <[email protected]> Authored: Wed Dec 4 21:52:11 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Wed Dec 4 21:52:11 2013 -0500 ---------------------------------------------------------------------- .../health/HealthEventMessageDelegator.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b7d5e7ef/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java index 2f0a3e2..a5607c6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java @@ -24,10 +24,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.AutoscalerContext; import org.apache.stratos.autoscaler.ClusterContext; +import org.apache.stratos.autoscaler.ClusterMonitor; import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClient; import org.apache.stratos.autoscaler.exception.SpawningException; import org.apache.stratos.autoscaler.exception.TerminationException; +import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.cloud.controller.deployment.partition.Partition; import javax.jms.TextMessage; @@ -57,6 +59,8 @@ public class HealthEventMessageDelegator implements Runnable { TextMessage message = HealthEventQueue.getInstance().take(); String messageText = message.getText(); + if(log.isDebugEnabled()) + log.debug("Health event message received. Message :" + messageText); messageProperties = setEventValues(messageText); this.clusterId = messageProperties.get("cluster_id"); @@ -86,8 +90,8 @@ public class HealthEventMessageDelegator implements Runnable { messageProperties.clear(); } catch (Exception e) { - String error = "Failed to retrieve the health stat event message."; - log.error(error); + String error = "Failed to retrieve the health stat event message." + e.getMessage(); + log.error(error ); } } } @@ -99,9 +103,12 @@ public class HealthEventMessageDelegator implements Runnable { ccClient.terminate(memberId); // start a new member in the same Partition - ClusterContext clsCtx = AutoscalerContext.getInstance().getClusterContext(clusterId); - String partitionId = clsCtx.getPartitonOfMember(memberId); - Partition partition = clsCtx.getDeploymentPolicy().getPartitionById(partitionId); + ClusterMonitor monitor = AutoscalerRuleEvaluator.getInstance().getMonitor(this.clusterId); + ClusterContext clusCtx = monitor.getClusterCtxt(); + + //ClusterContext clsCtx = AutoscalerContext.getInstance().getClusterContext(clusterId); + String partitionId = clusCtx.getPartitonOfMember(memberId); + Partition partition = clusCtx.getDeploymentPolicy().getPartitionById(partitionId); ccClient.spawnAnInstance(partition, clusterId); } catch (TerminationException e) {
