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 2015/06/21 20:45:08 UTC
[3/3] stratos git commit: Adding correct Reset for events in monitors
Adding correct Reset for events in monitors
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c919c666
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c919c666
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c919c666
Branch: refs/heads/master
Commit: c919c666afc973b9e31511222a336d376e127def
Parents: 58bea52
Author: reka <rt...@gmail.com>
Authored: Fri Jun 19 19:36:12 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Jun 22 00:09:51 2015 +0530
----------------------------------------------------------------------
.../monitor/component/ApplicationMonitor.java | 16 ++++++++--------
.../autoscaler/monitor/component/GroupMonitor.java | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c919c666/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 fd93367..60bd84d 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
@@ -135,6 +135,14 @@ public class ApplicationMonitor extends ParentComponentMonitor {
handleScalingDownBeyondMin(instanceContext, networkPartitionContext);
}
}
+
+ //Resetting the events events
+ instanceContext.setIdToScalingDownBeyondMinEvent(
+ new ConcurrentHashMap<String, ScalingDownBeyondMinEvent>());
+ instanceContext.setIdToScalingEvent(
+ new ConcurrentHashMap<String, ScalingEvent>());
+ instanceContext.setIdToScalingOverMaxEvent(
+ new ConcurrentHashMap<String, ScalingUpBeyondMaxEvent>());
}
}
}
@@ -166,9 +174,6 @@ public class ApplicationMonitor extends ParentComponentMonitor {
"Hence waiting for it to become active");
}
}
- //Resetting the values
- instanceContext.setIdToScalingOverMaxEvent(
- new ConcurrentHashMap<String, ScalingUpBeyondMaxEvent>());
}
@@ -242,11 +247,6 @@ public class ApplicationMonitor extends ParentComponentMonitor {
}
}
-
- //Resetting the events
- instanceContext.setIdToScalingDownBeyondMinEvent(
- new ConcurrentHashMap<String, ScalingDownBeyondMinEvent>());
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c919c666/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
index 822b625..dd83d9a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
@@ -146,8 +146,8 @@ public class GroupMonitor extends ParentComponentMonitor {
}
//Resetting the events events
- instanceContext.setIdToScalingOverMaxEvent(
- new ConcurrentHashMap<String, ScalingUpBeyondMaxEvent>());
+ instanceContext.setIdToScalingDownBeyondMinEvent(
+ new ConcurrentHashMap<String, ScalingDownBeyondMinEvent>());
instanceContext.setIdToScalingEvent(
new ConcurrentHashMap<String, ScalingEvent>());
instanceContext.setIdToScalingOverMaxEvent(