You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/06 11:36:05 UTC
[2/2] stratos git commit: fixing cluster instance issue
fixing cluster instance issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bebed805
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bebed805
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bebed805
Branch: refs/heads/master
Commit: bebed80565b0c374d84715776676e7449c138bb5
Parents: 7392207
Author: reka <rt...@gmail.com>
Authored: Sat Dec 6 15:11:07 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Sat Dec 6 15:11:07 2014 +0530
----------------------------------------------------------------------
.../topology/AutoscalerTopologyEventReceiver.java | 16 ++++++----------
.../messaging/topology/TopologyEventPublisher.java | 2 +-
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bebed805/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
index e007a3f..3cf6d81 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -419,7 +419,9 @@ public class AutoscalerTopologyEventReceiver {
(ClusterInstanceCreatedEvent) event;
AbstractClusterMonitor clusterMonitor = AutoscalerContext.getInstance().
getClusterMonitor(clusterInstanceCreatedEvent.getClusterId());
- String instanceId = ((ClusterInstanceCreatedEvent) event).getInstanceId();
+ ClusterInstance clusterInstance = ((ClusterInstanceCreatedEvent) event).
+ getClusterInstance();
+ String instanceId = clusterInstance.getInstanceId();
//FIXME to take lock when clusterMonitor is running
if (clusterMonitor != null) {
TopologyManager.acquireReadLockForCluster(clusterInstanceCreatedEvent.getServiceName(),
@@ -450,16 +452,10 @@ public class AutoscalerTopologyEventReceiver {
}
clusterContext.addInstanceContext(instanceId, cluster);
if (clusterMonitor.getInstance(instanceId) == null) {
- ClusterInstance clusterInstance = cluster.
+ //adding the same instance in topology to monitor as a reference
+ ClusterInstance clusterInstance1 = cluster.
getInstanceContexts(instanceId);
- ClusterInstance instance = new ClusterInstance(clusterInstance.getAlias(),
- cluster.getClusterId(),
- clusterInstance.getInstanceId());
- instance.setParentId(clusterInstance.getParentId());
- instance.setNetworkPartitionId(clusterInstance.getNetworkPartitionId());
- instance.setPartitionId(clusterInstance.getPartitionId());
- instance.setStatus(clusterInstance.getStatus());
- clusterMonitor.addInstance(instance);
+ clusterMonitor.addInstance(clusterInstance1);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bebed805/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyEventPublisher.java
index 2965a6f..4f28ea5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyEventPublisher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyEventPublisher.java
@@ -256,7 +256,7 @@ public class TopologyEventPublisher {
" in [network partition] %s [instance-id] %s",
clusterInstanceCreatedEvent.getServiceName(), clusterInstanceCreatedEvent.getClusterId(),
clusterInstanceCreatedEvent.getNetworkPartitionId(),
- clusterInstanceCreatedEvent.getInstanceId()));
+ clusterInstanceCreatedEvent.getClusterInstance().getInstanceId()));
}
publishEvent(clusterInstanceCreatedEvent);
}