Repository: stratos Updated Branches: refs/heads/master 6af14ca09 -> 0fec70b58
fixing wrongly used instanceId and networkpartitionid Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0fec70b5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0fec70b5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0fec70b5 Branch: refs/heads/master Commit: 0fec70b5865478c1fe6909054e779029b9e4bd84 Parents: 6af14ca Author: reka <[email protected]> Authored: Thu Dec 4 22:31:43 2014 +0530 Committer: reka <[email protected]> Committed: Thu Dec 4 22:46:28 2014 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 5 +- .../AutoscalerTopologyEventReceiver.java | 2 +- .../monitor/cluster/VMClusterMonitor.java | 77 ++++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0fec70b5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index b95c765..8078ebd 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -412,7 +412,10 @@ public class DefaultApplicationParser implements ApplicationParser { this.applicationClusterContexts.add(appClusterCtxt); // add relevant information to the map - clusterDataMap.put(subscriptionAlias, new ClusterDataHolder(cartridgeType, clusterId)); + ClusterDataHolder clusterDataHolder = new ClusterDataHolder(cartridgeType, clusterId); + clusterDataHolder.setMinInstances(cartridgeContext.getCartridgeMin()); + clusterDataHolder.setMaxInstances(cartridgeContext.getCartridgeMax()); + clusterDataMap.put(subscriptionAlias, clusterDataHolder); } http://git-wip-us.apache.org/repos/asf/stratos/blob/0fec70b5/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 729ae02..1849ef3 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 @@ -254,7 +254,7 @@ public class AutoscalerTopologyEventReceiver { return; } //changing the status in the monitor, will notify its parent monitor - ClusterInstance clusterInstance = (ClusterInstance)monitor.getInstance(instanceId); + ClusterInstance clusterInstance = (ClusterInstance) monitor.getInstance(instanceId); if (clusterInstance.getTransitionedStates().pop() == ClusterStatus.Active) { // terminated gracefully monitor.setStatus(ClusterStatus.Terminating, instanceId); http://git-wip-us.apache.org/repos/asf/stratos/blob/0fec70b5/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java index 2d086f6..618800f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java @@ -122,8 +122,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterInstanceContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterInstanceContext = getClusterInstanceContext(networkPartitionId, + instanceId); if (null != clusterInstanceContext) { clusterInstanceContext.setAverageLoadAverage(value); } else { @@ -400,8 +400,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { log.debug(String.format("Grad of load avg event: [cluster] %s [network-partition] %s [value] %s", clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setLoadAverageGradient(value); } else { @@ -424,8 +424,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { log.debug(String.format("Second Derivation of load avg event: [cluster] %s " + "[network-partition] %s [value] %s", clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setLoadAverageSecondDerivative(value); } else { @@ -448,8 +448,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { log.debug(String.format("Avg Memory Consumption event: [cluster] %s [network-partition] %s " + "[value] %s", clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setAverageMemoryConsumption(value); } else { @@ -473,8 +473,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { log.debug(String.format("Grad of Memory Consumption event: [cluster] %s " + "[network-partition] %s [value] %s", clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setMemoryConsumptionGradient(value); } else { @@ -497,8 +497,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { log.debug(String.format("Second Derivation of Memory Consumption event: [cluster] %s " + "[network-partition] %s [value] %s", clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setMemoryConsumptionSecondDerivative(value); } else { @@ -522,8 +522,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { clusterId, networkPartitionId, floatValue)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setAverageRequestsServedPerInstance(floatValue); @@ -554,8 +554,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { log.debug(String.format("Average Rif event: [cluster] %s [network-partition] %s [value] %s", clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setAverageRequestsInFlight(value); } else { @@ -578,8 +578,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { log.debug(String.format("Gradient of Rif event: [cluster] %s [network-partition] %s [value] %s", clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setRequestsInFlightGradient(value); } else { @@ -602,8 +602,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { log.debug(String.format("Second derivative of Rif event: [cluster] %s " + "[network-partition] %s [value] %s", clusterId, networkPartitionId, value)); } - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); if (null != clusterLevelNetworkPartitionContext) { clusterLevelNetworkPartitionContext.setRequestsInFlightSecondDerivative(value); } else { @@ -622,8 +622,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { String memberId = memberAverageMemoryConsumptionEvent.getMemberId(); Member member = getMemberByMemberId(memberId); String networkPartitionId = getNetworkPartitionIdByMemberId(memberId); - ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId, + instanceId); ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt( member.getPartitionId()); MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId); @@ -645,8 +645,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { String memberId = memberGradientOfMemoryConsumptionEvent.getMemberId(); Member member = getMemberByMemberId(memberId); String networkPartitionId = getNetworkPartitionIdByMemberId(memberId); - ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId, + instanceId); ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt( member.getPartitionId()); MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId); @@ -674,8 +674,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { String memberId = memberAverageLoadAverageEvent.getMemberId(); Member member = getMemberByMemberId(memberId); String networkPartitionId = getNetworkPartitionIdByMemberId(memberId); - ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId, + instanceId); ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt( member.getPartitionId()); MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId); @@ -697,8 +697,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { String memberId = memberGradientOfLoadAverageEvent.getMemberId(); Member member = getMemberByMemberId(memberId); String networkPartitionId = getNetworkPartitionIdByMemberId(memberId); - ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId, + instanceId); ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt( member.getPartitionId()); MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId); @@ -721,8 +721,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { Member member = getMemberByMemberId(memberId); String networkPartitionId = getNetworkPartitionIdByMemberId(memberId); - ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId, + instanceId); ClusterLevelPartitionContext partitionCtxt = networkPartitionCtxt.getPartitionCtxt( member.getPartitionId()); MemberStatsContext memberStatsContext = partitionCtxt.getMemberStatsContext(memberId); @@ -759,8 +759,7 @@ public class VMClusterMonitor extends AbstractClusterMonitor { } ClusterInstanceContext nwPartitionCtxt; - nwPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + nwPartitionCtxt = getClusterInstanceContext(networkPartitionId, instanceId); String partitionId = getPartitionOfMember(memberId); ClusterLevelPartitionContext partitionCtxt = nwPartitionCtxt.getPartitionCtxt(partitionId); if (!partitionCtxt.activeMemberExist(memberId)) { @@ -799,8 +798,7 @@ public class VMClusterMonitor extends AbstractClusterMonitor { String networkPartitionId = memberActivatedEvent.getNetworkPartitionId(); String partitionId = memberActivatedEvent.getPartitionId(); String memberId = memberActivatedEvent.getMemberId(); - ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId, instanceId); ClusterLevelPartitionContext clusterLevelPartitionContext; clusterLevelPartitionContext = networkPartitionCtxt.getPartitionCtxt(partitionId); clusterLevelPartitionContext.addMemberStatsContext(new MemberStatsContext(memberId)); @@ -821,8 +819,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { String partitionId = maintenanceModeEvent.getPartitionId(); String memberId = maintenanceModeEvent.getMemberId(); String instanceId = maintenanceModeEvent.getInstanceId(); - ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext networkPartitionCtxt = getClusterInstanceContext(networkPartitionId, + instanceId); ClusterLevelPartitionContext clusterMonitorPartitionContext = networkPartitionCtxt. getPartitionCtxt(partitionId); clusterMonitorPartitionContext.addMemberStatsContext(new MemberStatsContext(memberId)); @@ -839,8 +837,7 @@ public class VMClusterMonitor extends AbstractClusterMonitor { ClusterInstanceContext nwPartitionCtxt; String networkPartitionId = memberReadyToShutdownEvent.getNetworkPartitionId(); String instanceId = memberReadyToShutdownEvent.getInstanceId(); - nwPartitionCtxt = getClusterInstanceContext(instanceId, - networkPartitionId); + nwPartitionCtxt = getClusterInstanceContext(networkPartitionId, instanceId); // start a new member in the same Partition String memberId = memberReadyToShutdownEvent.getMemberId(); @@ -887,8 +884,8 @@ public class VMClusterMonitor extends AbstractClusterMonitor { String clusterId = memberTerminatedEvent.getClusterId(); String instanceId = memberTerminatedEvent.getInstanceId(); String partitionId = memberTerminatedEvent.getPartitionId(); - ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext(instanceId, - networkPartitionId); + ClusterInstanceContext clusterLevelNetworkPartitionContext = getClusterInstanceContext( + networkPartitionId, instanceId); ClusterLevelPartitionContext clusterMonitorPartitionContext = clusterLevelNetworkPartitionContext.getPartitionCtxt(partitionId); clusterMonitorPartitionContext.removeMemberStatsContext(memberId);
