Repository: stratos Updated Branches: refs/heads/4.0.0-grouping e3da9aa8c -> 2ce45977d
fixing min rule merging issue Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2ce45977 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2ce45977 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2ce45977 Branch: refs/heads/4.0.0-grouping Commit: 2ce45977d1914209688500907923dc7f5d76198d Parents: e3da9aa Author: Reka <[email protected]> Authored: Thu Aug 28 18:42:22 2014 +0530 Committer: Reka <[email protected]> Committed: Thu Aug 28 18:42:22 2014 +0530 ---------------------------------------------------------------------- .../stratos/modules/distribution/src/main/conf/mincheck.drl | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2ce45977/products/stratos/modules/distribution/src/main/conf/mincheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/mincheck.drl b/products/stratos/modules/distribution/src/main/conf/mincheck.drl index 833293c..e1f3770 100755 --- a/products/stratos/modules/distribution/src/main/conf/mincheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/mincheck.drl @@ -48,15 +48,12 @@ global org.apache.stratos.messaging.domain.topology.Topology $topology; global java.util.Map partitionCtxts; global java.lang.String clusterId; global java.lang.String lbRef; -<<<<<<< HEAD global java.lang.String serviceId; global org.apache.stratos.autoscaler.policy.model.AutoscalePolicy autoscalePolicy; -======= global java.lang.Boolean isPrimary; global Integer primaryMemberCount; ->>>>>>> master rule "Minimum Rule" dialect "mvel" @@ -65,15 +62,12 @@ dialect "mvel" eval(log.debug("Running minimum rule: [network-partition] " + $ctxt.getNetworkPartitionId() + " [partition] " + $ctxt.getPartitionId())) eval(log.debug("[min-check] [network-partition] " + $ctxt.getNetworkPartitionId() + " [partition] " + $ctxt.getPartitionId() + " Non terminated member count: " + $ctxt.getNonTerminatedMemberCount())) eval(log.debug("[min-check] [network-partition] " + $ctxt.getNetworkPartitionId() + " [partition] " + $ctxt.getPartitionId() + " Minimum member count: " + $ctxt.getMinimumMemberCount())) -<<<<<<< HEAD eval($ctxt.getNonTerminatedMemberCount() < $ctxt.getMinimumMemberCount()) eval(log.debug("Grouping ... checking startup dependencies for " + clusterId)) eval($ctxt.checkStartupDependencies(serviceId, clusterId)) eval(log.debug("startup dependencies successfully checked for" + clusterId)) -======= eval ( (isPrimary && (primaryMemberCount < $ctxt.getMinimumMemberCount() )) || ( !isPrimary && ($ctxt.getNonTerminatedMemberCount() < $ctxt.getMinimumMemberCount() )) ) ->>>>>>> master then if (isPrimary){ log.debug("[min-check] true [primary] true [primary member count] " + primaryMemberCount);
