Updated Branches: refs/heads/master 39207f67c -> 3df204620
Adding request in flight count when the list is not there Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9a38e275 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9a38e275 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9a38e275 Branch: refs/heads/master Commit: 9a38e2753f9985a58d42ffc6b2207fd5503aa494 Parents: fee25c8 Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Jan 15 19:31:50 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Jan 15 19:31:50 2014 +0530 ---------------------------------------------------------------------- .../LoadBalancerStatisticsCollector.java | 36 ++++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9a38e275/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java index a133cf9..fed672d 100644 --- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java +++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java @@ -60,6 +60,7 @@ public class LoadBalancerStatisticsCollector implements LoadBalancerStatisticsRe //Sliding window in Milliseconds int slidingWindow = 60000;//TODO get this from a config + if (inFlightRequestToDateListMap.containsKey(clusterId)) { Vector<Date> vector = inFlightRequestToDateListMap.get(clusterId); Iterator<Date> itr = vector.iterator(); @@ -79,22 +80,36 @@ public class LoadBalancerStatisticsCollector implements LoadBalancerStatisticsRe } public void addAnInFlightRequest(String clusterId) { + if (StringUtils.isBlank(clusterId)) { - if (log.isWarnEnabled()) { - log.warn(String.format("Cluster id is blank which try to set requests in flight" + + if (log.isDebugEnabled()) { + log.debug(String.format("Cluster id is blank which try to set requests in flight" + " : [cluster] %s", clusterId)); } return; } - if (!inFlightRequestToDateListMap.containsKey(clusterId)) { - Vector<Date> list = inFlightRequestToDateListMap.get(clusterId); - list.add(new Date()); - inFlightRequestToDateListMap.put(clusterId, list); + if (inFlightRequestToDateListMap.containsKey(clusterId)) { + + Vector<Date> vector = inFlightRequestToDateListMap.get(clusterId); + vector.add(new Date()); + inFlightRequestToDateListMap.put(clusterId, vector); + if (log.isDebugEnabled()) { + log.debug(String.format("In-flight request added to counting list: [cluster] %s [list size] %s ", clusterId, + inFlightRequestToDateListMap.get(clusterId).size())); + + } + } else { + + Vector<Date> vector = new Vector<Date>(); + vector.add(new Date()); + inFlightRequestToDateListMap.put(clusterId, vector); inFlightRequestToDateListMap.get(clusterId).add(new Date()); - } - if (log.isDebugEnabled()) { - log.debug(String.format("In-flight request added to counting list: [cluster] %s ", clusterId)); + + if (log.isDebugEnabled()) { + log.debug(String.format("New list is created for storing request in flight count: [cluster] %s ", clusterId)); + log.debug(String.format("In-flight request added to counting list: [cluster] %s ", clusterId)); + } } } @@ -117,7 +132,8 @@ public class LoadBalancerStatisticsCollector implements LoadBalancerStatisticsRe vector.remove(vector.size() - 1); if (log.isDebugEnabled()) { - log.debug(String.format("In-flight request removed from counting list: [cluster] %s ", clusterId)); + log.debug(String.format("In-flight request removed from counting list: [cluster] %s [list size] %s ", clusterId, + inFlightRequestToDateListMap.get(clusterId).size())); } } }
