You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/22 15:01:56 UTC
[1/3] stratos git commit: fixing graceful termination
Repository: stratos
Updated Branches:
refs/heads/master b4bf1c75d -> 6b5e26c66
fixing graceful termination
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7d2ecd34
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7d2ecd34
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7d2ecd34
Branch: refs/heads/master
Commit: 7d2ecd34d6bb096a88698b86d3dc521464db6463
Parents: b4bf1c7
Author: reka <rt...@gmail.com>
Authored: Mon Dec 22 19:22:56 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Dec 22 19:22:56 2014 +0530
----------------------------------------------------------------------
.../event/receiver/topology/AutoscalerTopologyEventReceiver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d2ecd34/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
index 5f77a1a..54ca42a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -258,7 +258,7 @@ public class AutoscalerTopologyEventReceiver {
}
//changing the status in the monitor, will notify its parent monitor
ClusterInstance clusterInstance = (ClusterInstance) monitor.getInstance(clusterInstanceId);
- if (clusterInstance.getCurrentState() == ClusterStatus.Active) {
+ if (clusterInstance.getPreviousState() == ClusterStatus.Active) {
// terminated gracefully
monitor.notifyParentMonitor(ClusterStatus.Terminating, clusterInstanceId);
InstanceNotificationPublisher.getInstance().
[3/3] stratos git commit: fixing restart issue
Posted by re...@apache.org.
fixing restart issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6b5e26c6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6b5e26c6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6b5e26c6
Branch: refs/heads/master
Commit: 6b5e26c66e77acabcb424f3be79ce187f9beda69
Parents: 9c2e3cd
Author: reka <rt...@gmail.com>
Authored: Mon Dec 22 19:31:08 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Dec 22 19:31:08 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/cluster/ClusterMonitor.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6b5e26c6/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 5659416..da288f4 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
@@ -1178,12 +1178,12 @@ public class ClusterMonitor extends AbstractClusterMonitor {
if (!stateChanged && clusterInstance.getStatus() != ClusterStatus.Created) {
this.notifyParentMonitor(clusterInstance.getStatus(),
clusterInstance.getInstanceId());
-
- if (this.hasMonitoringStarted().compareAndSet(false, true)) {
- this.startScheduler();
- log.info("Monitoring task for Cluster Monitor with cluster id " +
- cluster.getClusterId() + " started successfully");
- }
+ }
+
+ if (this.hasMonitoringStarted().compareAndSet(false, true)) {
+ this.startScheduler();
+ log.info("Monitoring task for Cluster Monitor with cluster id " +
+ cluster.getClusterId() + " started successfully");
}
} else {
createClusterInstance(cluster.getServiceName(), cluster.getClusterId(), null, parentInstanceId, partitionId,
[2/3] stratos git commit: stopping monitor thread
Posted by re...@apache.org.
stopping monitor thread
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9c2e3cd3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9c2e3cd3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9c2e3cd3
Branch: refs/heads/master
Commit: 9c2e3cd3b8efd001c0044eea88d3b209c303d1b9
Parents: 7d2ecd3
Author: reka <rt...@gmail.com>
Authored: Mon Dec 22 19:28:00 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Dec 22 19:28:00 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/monitor/component/ApplicationMonitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9c2e3cd3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
index a19a4fa..b510d22 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
@@ -442,7 +442,7 @@ public class ApplicationMonitor extends ParentComponentMonitor {
@Override
public void destroy() {
- //TODO to wipe out the drools
+ stopScheduler();
}
@Override