Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 7619d85c0 -> 6f7baa85e
more clean up of grouping poc artifacts ... Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6f7baa85 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6f7baa85 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6f7baa85 Branch: refs/heads/4.0.0-grouping Commit: 6f7baa85ee484c851f67e80922a546764805d4f2 Parents: 7619d85 Author: Martin Eppel <[email protected]> Authored: Fri Oct 24 14:43:58 2014 -0700 Committer: Martin Eppel <[email protected]> Committed: Fri Oct 24 14:43:58 2014 -0700 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 40 -------------------- .../monitor/AbstractClusterMonitor.java | 19 ---------- .../monitor/cluster/ClusterMonitor.java | 21 +--------- .../rule/AutoscalerRuleEvaluator.java | 14 +------ .../modules/distribution/src/assembly/bin.xml | 6 --- .../distribution/src/main/conf/mincheck.drl | 3 -- 6 files changed, 2 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6f7baa85/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java index 93d4b6a..613aa4f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/PartitionContext.java @@ -395,46 +395,6 @@ public class PartitionContext implements Serializable{ return results; } - public boolean checkStartupDependencies (String serviceType, String clusterId) { - if (log.isDebugEnabled()) { - log.debug("checkStartupDependencies for cluster with " + " clusterId: " + clusterId); - } - - - ComplexApplicationContext sgc = new ComplexApplicationContext(); - - String aServiceName = clusterId; - boolean flag = sgc.checkStartupDependencies(serviceType, aServiceName); - if (log.isDebugEnabled()) { - log.debug("checkStartupDependencies for cluster with " + - " clusterId: " + clusterId + " serviceType: " + serviceType + - " flag is :" + flag); - } - - return flag; - - } - - public boolean checkKillDependencies (String serviceType, String clusterId) { - if (log.isDebugEnabled()) { - log.debug("PartitionContext:checkServiceBootDependencies for cluster with " + " clusterId: " + clusterId + - "and serviceType " + serviceType); - } - - ComplexApplicationContext sgc = new ComplexApplicationContext(); - - String aServiceName = clusterId; - boolean flag = sgc.checkKillDependencies(serviceType, aServiceName); - if (log.isDebugEnabled()) { - log.debug("checkKillDependencies for cluster with " + - " clusterId: " + clusterId + " serviceType: " + serviceType + - " flag is :" + flag); - } - return flag; - - } - - private class PendingMemberWatcher implements Runnable { private PartitionContext ctxt; http://git-wip-us.apache.org/repos/asf/stratos/blob/6f7baa85/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java index 3993683..e816a42 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/AbstractClusterMonitor.java @@ -58,7 +58,6 @@ abstract public class AbstractClusterMonitor extends Monitor implements Runnable protected StatefulKnowledgeSession minCheckKnowledgeSession; protected StatefulKnowledgeSession scaleCheckKnowledgeSession; - protected StatefulKnowledgeSession terminateDependencyKnowledgeSession; protected StatefulKnowledgeSession terminateAllKnowledgeSession; protected boolean isDestroyed; @@ -121,7 +120,6 @@ abstract public class AbstractClusterMonitor extends Monitor implements Runnable minCheckKnowledgeSession.dispose(); scaleCheckKnowledgeSession.dispose(); terminateAllKnowledgeSession.dispose(); - terminateDependencyKnowledgeSession.dispose(); setDestroyed(true); if (log.isDebugEnabled()) { log.debug("Cluster Monitor Drools session has been disposed. " + this.toString()); @@ -218,23 +216,6 @@ abstract public class AbstractClusterMonitor extends Monitor implements Runnable this.minCheckFactHandle = minCheckFactHandle; } - public StatefulKnowledgeSession getTerminateDependencyKnowledgeSession() { - return terminateDependencyKnowledgeSession; - } - - public void setTerminateDependencyKnowledgeSession( - StatefulKnowledgeSession terminateDependencyKnowledgeSession) { - this.terminateDependencyKnowledgeSession = terminateDependencyKnowledgeSession; - } - - public FactHandle getTerminateDependencyFactHandle() { - return terminateDependencyFactHandle; - } - - public void setTerminateDependencyFactHandle( - FactHandle terminateDependencyFactHandle) { - this.terminateDependencyFactHandle = terminateDependencyFactHandle; - } public int getMonitorInterval() { return monitorInterval; http://git-wip-us.apache.org/repos/asf/stratos/blob/6f7baa85/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java index 38b554c..0848d64 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java @@ -57,7 +57,6 @@ public class ClusterMonitor extends AbstractClusterMonitor { this.autoscalerRuleEvaluator = new AutoscalerRuleEvaluator(); this.scaleCheckKnowledgeSession = autoscalerRuleEvaluator.getScaleCheckStatefulSession(); this.minCheckKnowledgeSession = autoscalerRuleEvaluator.getMinCheckStatefulSession(); - this.terminateDependencyKnowledgeSession = autoscalerRuleEvaluator.getTerminateDependencyStatefulSession(); this.terminateAllKnowledgeSession = autoscalerRuleEvaluator.getTerminateAllStatefulSession(); this.deploymentPolicy = deploymentPolicy; @@ -175,25 +174,7 @@ public class ClusterMonitor extends AbstractClusterMonitor { } - //terminate dependency per partition - // rule terminates all members of a service which is a prerequisites for other services - for (PartitionContext partitionContext : networkPartitionContext.getPartitionCtxts().values()) { - - terminateDependencyKnowledgeSession.setGlobal("clusterId", clusterId); - terminateDependencyKnowledgeSession.setGlobal("lbRef", lbReferenceType); - terminateDependencyKnowledgeSession.setGlobal("autoscalePolicy", autoscalePolicy); - terminateDependencyKnowledgeSession.setGlobal("serviceId", serviceId); - - if (log.isDebugEnabled()) { - log.debug(String.format("Running terminate dependency for partition %s ", partitionContext.getPartitionId())); - } - - terminateDependencyFactHandle = AutoscalerRuleEvaluator.evaluateTerminateDependency(terminateDependencyKnowledgeSession - , terminateDependencyFactHandle, partitionContext); - - } - - boolean rifReset = networkPartitionContext.isRifReset(); + boolean rifReset = networkPartitionContext.isRifReset(); boolean memoryConsumptionReset = networkPartitionContext.isMemoryConsumptionReset(); boolean loadAverageReset = networkPartitionContext.isLoadAverageReset(); http://git-wip-us.apache.org/repos/asf/stratos/blob/6f7baa85/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java index 68511b7..e7810c9 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java @@ -47,13 +47,11 @@ public class AutoscalerRuleEvaluator { private static final String DRL_FILE_NAME = "mincheck.drl"; private static final String SCALING_DRL_FILE_NAME = "scaling.drl"; private static final String TERMINATE_ALL_DRL_FILE_NAME = "terminateall.drl"; - private static final String TERMINATE_DEPENDENCY_DRL_FILE_NAME = "terminatedependency.drl"; private static KnowledgeBase minCheckKbase; private static KnowledgeBase scaleCheckKbase; @SuppressWarnings("unused") private static KnowledgeBase terminateAllKbase; - private static KnowledgeBase terminateDependencyKbase; public AutoscalerRuleEvaluator(){ @@ -75,11 +73,6 @@ public class AutoscalerRuleEvaluator { log.debug("Terminate all rule is parsed successfully"); } - terminateDependencyKbase = readKnowledgeBase(TERMINATE_DEPENDENCY_DRL_FILE_NAME); - - if (log.isDebugEnabled()) { - log.debug("Terminate dependency rule is parsed successfully"); - } } @@ -177,12 +170,7 @@ public class AutoscalerRuleEvaluator { ksession.setGlobal("log", RuleLog.getInstance()); return ksession; } - public StatefulKnowledgeSession getTerminateDependencyStatefulSession() { - StatefulKnowledgeSession ksession; - ksession = terminateDependencyKbase.newStatefulKnowledgeSession(); - ksession.setGlobal("log", RuleLog.getInstance()); - return ksession; - } + public static String getLbClusterId(PartitionContext partitionContext, String nwpartitionId) { Properties props = partitionContext.getProperties(); http://git-wip-us.apache.org/repos/asf/stratos/blob/6f7baa85/products/stratos/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index 38242cd..edeebab 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -653,12 +653,6 @@ <filtered>true</filtered> <fileMode>755</fileMode> </file> - <file> - <source>src/main/conf/terminatedependency.drl</source> - <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> - <filtered>true</filtered> - <fileMode>755</fileMode> - </file> <!-- autoscaler --> <file> <source>${project.basedir}/INSTALL.txt</source> http://git-wip-us.apache.org/repos/asf/stratos/blob/6f7baa85/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 ed331cf..105523d 100755 --- a/products/stratos/modules/distribution/src/main/conf/mincheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/mincheck.drl @@ -63,9 +63,6 @@ dialect "mvel" 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())) eval ( (isPrimary && (primaryMemberCount < $ctxt.getMinimumMemberCount() )) || ( !isPrimary && ($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)) then if (isPrimary){ log.debug("[min-check] true [primary] true [primary member count] " + primaryMemberCount);
