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/11/18 10:56:51 UTC
[1/2] stratos git commit: fixing STRATOS-975
Repository: stratos
Updated Branches:
refs/heads/master e784a83cb -> 5afa70e49
fixing STRATOS-975
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/474f6710
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/474f6710
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/474f6710
Branch: refs/heads/master
Commit: 474f6710be025fb246d7ff68919988a1bd28f6e8
Parents: b05a211
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Nov 18 15:25:54 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Tue Nov 18 15:25:54 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/status/checker/StatusChecker.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/474f6710/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
index 683fb79..b5729c2 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
@@ -348,13 +348,13 @@ public class StatusChecker {
//send the terminated event
if (parent instanceof Application) {
//validating the life cycle
- if (application.getStatus().equals(ApplicationStatus.Terminated)) {
+ //if (application.getStatus() != ApplicationStatus.Terminated) {
log.info("sending app terminated: " + appId);
ApplicationBuilder.handleApplicationTerminatedEvent(appId);
- } else {
- log.info("[Application] " + appId + " is in the [status] " +
- application.getStatus().toString() + ". Hence not sending terminated event");
- }
+// } else {
+// log.info("[Application] " + appId + " is in the [status] " +
+// application.getStatus().toString() + ". Hence not sending terminated event");
+// }
//StatusEventPublisher.sendApp(appId);
} else if (parent instanceof Group) {
//send activation to the parent
[2/2] stratos git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5afa70e4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5afa70e4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5afa70e4
Branch: refs/heads/master
Commit: 5afa70e49be940090331bf7ee10430659bca9b32
Parents: 474f671 e784a83
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Nov 18 15:26:18 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Tue Nov 18 15:26:18 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/EventHandler.java | 1 -
.../monitor/MonitorStatusEventBuilder.java | 2 +-
.../KubernetesServiceClusterMonitor.java | 1 -
.../cluster/VMServiceClusterMonitor.java | 4 +-
.../monitor/events/ClusterScalingEvent.java | 43 --------------------
.../autoscaler/rule/RuleTasksDelegator.java | 5 +--
.../src/main/conf/drools/scaling.drl | 4 +-
7 files changed, 7 insertions(+), 53 deletions(-)
----------------------------------------------------------------------