Repository: stratos Updated Branches: refs/heads/tenant-isolation ab79b1a35 -> a4da2473d
Update uuid for autoscaling events Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a4da2473 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a4da2473 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a4da2473 Branch: refs/heads/tenant-isolation Commit: a4da2473df24403a2c191a9345954fb8b03f18c3 Parents: ab79b1a Author: Gayan Gunarathne <[email protected]> Authored: Fri Jul 24 15:11:34 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Fri Jul 24 15:11:34 2015 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/rule/RuleTasksDelegator.java | 11 +---------- .../stratos/messaging/domain/instance/Instance.java | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a4da2473/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index 985de51..c2d2be6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -40,8 +40,6 @@ import org.apache.stratos.cloud.controller.stub.domain.NetworkPartition; import org.apache.stratos.common.client.CloudControllerServiceClient; import org.apache.stratos.common.constants.StratosConstants; -import java.rmi.RemoteException; - /** * This will have utility methods that need to be executed from rule file... */ @@ -262,14 +260,7 @@ public class RuleTasksDelegator { } //Notify parent for checking scaling dependencies ClusterMonitor clusterMonitor = AutoscalerContext.getInstance().getClusterMonitor(clusterId); - String networkPartition= null; - try { - networkPartition = - CloudControllerServiceClient.getInstance().getNetworkPartition(networkPartitionId).getId(); - } catch (RemoteException e) { - log.error("Error while retrieving the network partition"); - } - clusterMonitor.sendScalingDownBeyondMinEvent(networkPartition, instanceId); + clusterMonitor.sendScalingDownBeyondMinEvent(networkPartitionId, instanceId); } public void delegateTerminate(ClusterLevelPartitionContext clusterMonitorPartitionContext, String memberId) { http://git-wip-us.apache.org/repos/asf/stratos/blob/a4da2473/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java index 94dbd7b..0614c9a 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/Instance.java @@ -38,7 +38,7 @@ public abstract class Instance<T extends LifeCycleState> implements Serializable //Parent instance id private String parentId; //Network partition id - private String networkPartitionId; + private String networkPartitionId; //refactor to uuid //partition id protected String partitionId;
