You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/14 17:47:21 UTC
stratos git commit: Adding cluster id to rules logs
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 9da7f40e6 -> 11215791f
Adding cluster id to rules logs
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/11215791
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/11215791
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/11215791
Branch: refs/heads/4.1.0-test
Commit: 11215791fbca9625fc9d6f9ba3ab3a5a9d23dcf3
Parents: 9da7f40
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Dec 14 22:19:07 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Dec 14 22:19:23 2014 +0530
----------------------------------------------------------------------
.../distribution/src/main/conf/drools/mincheck.drl | 12 ++++++------
.../distribution/src/main/conf/drools/obsoletecheck.drl | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/11215791/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 4524e93..fc08421 100755
--- a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl
@@ -59,8 +59,8 @@ dialect "mvel"
autoscaleAlgorithm : AutoscaleAlgorithm() from delegator.getAutoscaleAlgorithm(algorithmName)
eval(log.debug("Running minimum rule: [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster-instance] " + clusterInstanceContext.getId()))
- eval(log.debug("[min-check] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster-instance] " + clusterInstanceContext.getId() + " Non terminated member count: " + clusterInstanceContext.getNonTerminatedMemberCount()))
- eval(log.debug("[min-check] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster-instance] " + clusterInstanceContext.getId() + " Minimum member count: " + clusterInstanceContext.getMinInstanceCount()))
+ eval(log.debug("[min-check] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster-instance] " + clusterInstanceContext.getId() + " [cluster] " + clusterId + " Non terminated member count: " + clusterInstanceContext.getNonTerminatedMemberCount()))
+ eval(log.debug("[min-check] [network-partition] " + clusterInstanceContext.getNetworkPartitionId() + " [cluster-instance] " + clusterInstanceContext.getId() + " [cluster] " + clusterId + " Minimum member count: " + clusterInstanceContext.getMinInstanceCount()))
eval ( (isPrimary && (primaryMemberCount < clusterInstanceContext.getMinInstanceCount())) || ( !isPrimary && (clusterInstanceContext.getNonTerminatedMemberCount() < clusterInstanceContext.getMinInstanceCount())) )
@@ -70,11 +70,11 @@ dialect "mvel"
if(isPrimary){
additionalInstances = clusterInstanceContext.getMinInstanceCount() - primaryMemberCount;
- log.debug("[min-check] true [primary] true [primary member count] " + primaryMemberCount + " [cluster] " + clusterInstanceContext.getClusterId());
+ log.debug("[min-check] true [primary] true [primary member count] " + primaryMemberCount + " [cluster] " + clusterId);
} else {
additionalInstances = clusterInstanceContext.getMinInstanceCount() - clusterInstanceContext.getNonTerminatedMemberCount();
- log.debug("[min-check] true [primary] false [non terminated member count] " + clusterInstanceContext.getNonTerminatedMemberCount()+ " [cluster] " + clusterInstanceContext.getClusterId());
+ log.debug("[min-check] true [primary] false [non terminated member count] " + clusterInstanceContext.getNonTerminatedMemberCount()+ " [cluster] " + clusterId);
}
int count = 0;
@@ -84,8 +84,8 @@ dialect "mvel"
ClusterLevelPartitionContext partitionContext = (ClusterLevelPartitionContext)autoscaleAlgorithm.getNextScaleUpPartitionContext(clusterInstanceContext.getPartitionCtxtsAsAnArray());
if(partitionContext != null){
- log.info("[min-check] Partition available, hence trying to spawn an instance to fulfil minimum count!" + " [cluster] " + clusterInstanceContext.getClusterId());
- log.debug("[min-check] " + " [partition] " + partitionContext.getPartitionId() + " [cluster] " + clusterId + " [cluster] " + clusterInstanceContext.getClusterId());
+ 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);
delegator.delegateSpawn(partitionContext, clusterId, clusterInstanceContext.getId(), isPrimary);
count++;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11215791/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl
index 894cf2a..8ddc88e 100755
--- a/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl
@@ -55,11 +55,11 @@ rule "Terminate Obsoleted Instances"
dialect "mvel"
when
ctxt : ClusterLevelPartitionContext ()
- eval(log.debug("Running obsolete instances rule: [partition] " + ctxt.getPartitionId() + " [network-partition] " + ctxt.getNetworkPartitionId()))
- eval(log.debug("[obsolete-check] [network-partition] " + ctxt.getNetworkPartitionId() + " [partition] " + ctxt.getPartitionId() +" Obsolete member count: " + ctxt.getObsoletedMembers().size()))
+ eval(log.debug("Running obsolete instances rule: [partition] " + ctxt.getPartitionId() + " [network-partition] " + ctxt.getNetworkPartitionId() + " [cluster] " + clusterId))
+ eval(log.debug("[obsolete-check] [network-partition] " + ctxt.getNetworkPartitionId() + " [partition] " + ctxt.getPartitionId() + " [cluster] " + clusterId +" Obsolete member count: " + ctxt.getObsoletedMembers().size()))
eval(ctxt.getObsoletedMembers().keySet().size() > 0)
memberId : String() from ctxt.getObsoletedMembers().keySet()
- eval(log.debug("[obsolete-check] [network-partition] " + ctxt.getNetworkPartitionId() + " [partition] " + ctxt.getPartitionId() + " Member id: " + memberId))
+ eval(log.debug("[obsolete-check] [network-partition] " + ctxt.getNetworkPartitionId() + " [partition] " + ctxt.getPartitionId() + " [cluster] " + clusterId + " Member id: " + memberId))
then
delegator.terminateObsoleteInstance(memberId);
end
@@ -69,10 +69,10 @@ dialect "mvel"
when
ctxt : ClusterLevelPartitionContext ()
eval(log.debug("Running instances cleanup event sender rule: [partition] " + ctxt.getPartitionId() + " [network-partition] " + ctxt.getNetworkPartitionId()))
- eval(log.debug("[instance-cleanup-check] [network-partition] " + ctxt.getNetworkPartitionId() + " [partition] " + ctxt.getPartitionId() +" Pending termination member count: " + ctxt.getTerminationPendingMembers().size()))
+ eval(log.debug("[instance-cleanup-check] [network-partition] " + ctxt.getNetworkPartitionId() + " [partition] " + ctxt.getPartitionId() + " [cluster] " + clusterId + " Pending termination member count: " + ctxt.getTerminationPendingMembers().size()))
eval(ctxt.getTerminationPendingMembers().size() > 0)
memberId : String() from ctxt.getTerminationPendingMembers()
- eval(log.debug("[instance-cleanup-check ] [network-partition] " + ctxt.getNetworkPartitionId() + " [partition] " + ctxt.getPartitionId() + " Member id: " + memberId))
+ eval(log.debug("[instance-cleanup-check ] [network-partition] " + ctxt.getNetworkPartitionId() + " [partition] " + ctxt.getPartitionId() + " [cluster] " + clusterId + " Member id: " + memberId))
then
delegator.delegateInstanceCleanup(memberId);
end