You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/10/23 09:37:49 UTC
git commit: fixing STRATOS-906 and initial app undeployment
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping 9beae4592 -> edd105e20
fixing STRATOS-906 and initial app undeployment
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/edd105e2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/edd105e2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/edd105e2
Branch: refs/heads/4.0.0-grouping
Commit: edd105e200337297e1c55caaffd7b803126edb6c
Parents: 9beae45
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Thu Oct 23 13:06:59 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Thu Oct 23 13:06:59 2014 +0530
----------------------------------------------------------------------
.../topology/AutoscalerTopologyEventReceiver.java | 2 +-
.../autoscaler/monitor/cluster/ClusterMonitor.java | 15 ++++++++++-----
.../autoscaler/rule/AutoscalerRuleEvaluator.java | 3 ++-
.../stratos/autoscaler/rule/RuleTasksDelegator.java | 5 +++++
.../receiver/ApplicationStatusTopicReceiver.java | 10 ++--------
.../ApplicationStatusMessageProcessorChain.java | 2 --
6 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/edd105e2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
index 7ae7df0..bb91b7e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -325,8 +325,8 @@ public class AutoscalerTopologyEventReceiver implements Runnable {
((ClusterMonitor) AutoscalerContext.getInstance().getMonitor(clusterId));
if (clusterMonitor != null) {
clusterMonitor.setDestroyed(true);
- clusterMonitor.setStatus(ClusterStatus.Terminating);
clusterMonitor.terminateAllMembers();
+ clusterMonitor.setStatus(ClusterStatus.Terminating);
} else {
log.warn("No Cluster Monitor found for cluster id " + clusterId);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/edd105e2/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 8396f55..38b554c 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
@@ -102,11 +102,16 @@ public class ClusterMonitor extends AbstractClusterMonitor {
public void terminateAllMembers() {
for (NetworkPartitionContext networkPartitionContext : networkPartitionCtxts.values()) {
- //if (log.isDebugEnabled()) {
- log.info("Starting to terminate all members in Network Partition " + networkPartitionContext.getId());
- // }
- terminateAllFactHandle = AutoscalerRuleEvaluator.evaluateTerminateAll
- (terminateAllKnowledgeSession, terminateAllFactHandle, networkPartitionContext);
+ for (PartitionContext partitionContext : networkPartitionContext.getPartitionCtxts().values()) {
+ //if (log.isDebugEnabled()) {
+ log.info("Starting to terminate all members in Network Partition [ " +
+ networkPartitionContext.getId() + " ], Partition [ " +
+ partitionContext.getPartitionId() + " ]");
+ // }
+
+ terminateAllFactHandle = AutoscalerRuleEvaluator.evaluateTerminateAll
+ (terminateAllKnowledgeSession, terminateAllFactHandle, partitionContext);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/edd105e2/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 133483e..68511b7 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
@@ -68,6 +68,7 @@ public class AutoscalerRuleEvaluator {
if (log.isDebugEnabled()) {
log.debug("Scale check rule is parsed successfully");
}
+
terminateAllKbase = readKnowledgeBase(TERMINATE_ALL_DRL_FILE_NAME);
if (log.isDebugEnabled()) {
@@ -172,7 +173,7 @@ public class AutoscalerRuleEvaluator {
}
public StatefulKnowledgeSession getTerminateAllStatefulSession() {
StatefulKnowledgeSession ksession;
- ksession = scaleCheckKbase.newStatefulKnowledgeSession();
+ ksession = terminateAllKbase.newStatefulKnowledgeSession();
ksession.setGlobal("log", RuleLog.getInstance());
return ksession;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/edd105e2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
index 57043d9..350a975 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
@@ -172,6 +172,11 @@ public class RuleTasksDelegator {
}
public void delegateTerminate(PartitionContext partitionContext, String memberId) {
+
+ log.info("Starting to terminate Member [ " + memberId + " ], in Partition [ " +
+ partitionContext.getPartitionId() + " ], NW Partition [ " +
+ partitionContext.getNetworkPartitionId() + " ]");
+
try {
//calling SM to send the instance notification event.
InstanceNotificationClient.getInstance().sendMemberCleanupEvent(memberId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/edd105e2/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java
index bfd0167..7c0abfc 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java
@@ -23,13 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.topology.TopologyBuilder;
import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.application.status.*;
-import org.apache.stratos.messaging.event.topology.GroupTerminatedEvent;
-import org.apache.stratos.messaging.event.topology.GroupTerminatingEvent;
import org.apache.stratos.messaging.listener.application.status.*;
-import org.apache.stratos.messaging.listener.topology.ClusterActivatedEventListener;
-import org.apache.stratos.messaging.listener.topology.GroupActivatedEventListener;
-import org.apache.stratos.messaging.listener.topology.GroupTerminatedEventListener;
-import org.apache.stratos.messaging.listener.topology.GroupTerminatingEventListener;
import org.apache.stratos.messaging.message.receiver.application.status.ApplicationStatusEventReceiver;
public class ApplicationStatusTopicReceiver implements Runnable {
@@ -86,7 +80,7 @@ public class ApplicationStatusTopicReceiver implements Runnable {
}
});
- statusEventReceiver.addEventListener(new GroupTerminatedEventListener() {
+ statusEventReceiver.addEventListener(new GroupInTerminatedEventListener() {
@Override
protected void onEvent(Event event) {
TopologyBuilder.handleGroupTerminatedEvent((GroupInTerminatedEvent) event);
@@ -94,7 +88,7 @@ public class ApplicationStatusTopicReceiver implements Runnable {
}
});
- statusEventReceiver.addEventListener(new GroupTerminatingEventListener() {
+ statusEventReceiver.addEventListener(new GroupInTerminatingEventListener() {
@Override
protected void onEvent(Event event) {
TopologyBuilder.handleGroupTerminatingEvent((GroupInTerminatingEvent) event);
http://git-wip-us.apache.org/repos/asf/stratos/blob/edd105e2/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java
index d5dccbb..24cb122 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java
@@ -22,8 +22,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.messaging.listener.EventListener;
import org.apache.stratos.messaging.listener.application.status.*;
-import org.apache.stratos.messaging.listener.topology.ClusterActivatedEventListener;
-import org.apache.stratos.messaging.listener.topology.GroupActivatedEventListener;
import org.apache.stratos.messaging.message.processor.MessageProcessorChain;
/**