Update drools files with obsolete partition check
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c4627b6a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c4627b6a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c4627b6a Branch: refs/heads/master Commit: c4627b6a217d6b179351b6df8ddae8029671e6aa Parents: 779c643 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Apr 24 14:44:30 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Apr 24 14:44:30 2015 +0530 ---------------------------------------------------------------------- .../modules/distribution/src/main/conf/drools/maxcheck.drl | 2 ++ .../modules/distribution/src/main/conf/drools/mincheck.drl | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c4627b6a/products/stratos/modules/distribution/src/main/conf/drools/maxcheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/maxcheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/maxcheck.drl index 4d5668b..08cad47 100755 --- a/products/stratos/modules/distribution/src/main/conf/drools/maxcheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/maxcheck.drl @@ -53,6 +53,8 @@ dialect "mvel" partitionContext : ClusterLevelPartitionContext() from clusterInstanceContext.getPartitionCtxtsAsAnArray() + eval(!partitionContext.isObsoletePartition) + eval(log.debug("[max-check] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster-instance] " + clusterInstanceContext.getId() + " [cluster] " + clusterId + " [partition] " + partitionContext.getPartitionId() + " Activated member count: " + partitionContext.getActiveInstanceCount() http://git-wip-us.apache.org/repos/asf/stratos/blob/c4627b6a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl index 1be412a..96b60da 100755 --- a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl @@ -79,7 +79,8 @@ dialect "mvel" while(count != additionalInstances && partitionsAvailable){ ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext)partitionAlgorithm.getNextScaleUpPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray()); - if(partitionContext != null){ + + if(partitionContext != null){ log.info("[min-check] Partition available, hence trying to spawn an instance to fulfil minimum count!" + " [cluster] " + clusterId); log.debug("[min-check] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId);
