You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/12/27 20:08:25 UTC

[1/2] git commit: Initializing load average and memory consumption object values

Updated Branches:
  refs/heads/master 0f819bb6e -> 2fd5d40bd


Initializing load average and memory consumption object values


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/469a02a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/469a02a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/469a02a4

Branch: refs/heads/master
Commit: 469a02a41ac96f874e493c4bb76933719dd0a71e
Parents: 9ac01eb
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sat Dec 28 00:42:02 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Dec 28 00:42:02 2013 +0530

----------------------------------------------------------------------
 .../stratos/autoscaler/policy/model/LoadAverage.java      | 10 +++++-----
 .../autoscaler/policy/model/MemoryConsumption.java        | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/469a02a4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
index 9a64de0..40acc47 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
@@ -27,11 +27,11 @@ import java.io.Serializable;
 public class LoadAverage implements Serializable{
 
 	private static final long serialVersionUID = -2109860338694123343L;
-	private float average;
-    private float secondDerivative;
-    private float gradient;
-    private float scaleDownMarginOfGradient;
-    private float scaleDownMarginOfSecondDerivative;
+	private float average = 0.0f;
+    private float secondDerivative =  0.0f;
+    private float gradient =  0.0f;
+    private float scaleDownMarginOfGradient  =  0.0f;
+    private float scaleDownMarginOfSecondDerivative =  0.0f;
 
     /**
      * Gets the value of the average property.   

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/469a02a4/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
index 9696f41..201af7b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
@@ -27,11 +27,11 @@ import java.io.Serializable;
 public class MemoryConsumption implements Serializable {
 
 	private static final long serialVersionUID = 5755634390464664663L;
-	private float average;
-    private float secondDerivative;
-    private float gradient;
-    private float scaleDownMarginOfGradient;
-    private float scaleDownMarginOfSecondDerivative;
+	private float average =  0.0f;
+    private float secondDerivative =  0.0f;
+    private float gradient =  0.0f;
+    private float scaleDownMarginOfGradient =  0.0f;
+    private float scaleDownMarginOfSecondDerivative =  0.0f;
 
 
     /**


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2fd5d40b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2fd5d40b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2fd5d40b

Branch: refs/heads/master
Commit: 2fd5d40bd3d30dd2601e4dee3dcd1f32bc3c73c7
Parents: 469a02a 0f819bb
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sat Dec 28 00:42:33 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sat Dec 28 00:42:33 2013 +0530

----------------------------------------------------------------------
 .../autoscaler/policy/model/LoadAverage.java    |   5 +
 .../policy/model/MemoryConsumption.java         |   5 +
 .../stratos/autoscaler/TestRulesPackaged.java   |  66 +++++++++
 .../LoadBalancerStatisticsReader.java           |  34 +++++
 .../LoadBalancerStatisticsNotifier.java         | 116 ++++++++++++++++
 .../extension/api/LoadBalancerExtension.java    |  14 +-
 ...oadBalancerInFlightRequestCountNotifier.java | 101 --------------
 .../extension/api/LoadBalancerStatsReader.java  |  34 -----
 .../TenantAwareLoadBalanceEndpoint.java         |   4 +-
 .../internal/LoadBalancerServiceComponent.java  |  19 +++
 .../balancer/mediators/ResponseInterceptor.java |   4 +-
 ...adBalancerInFlightRequestCountCollector.java | 136 -------------------
 .../LoadBalancerStatisticsCollector.java        | 101 ++++++++++++++
 .../WSO2CEPInFlightRequestCountObserver.java    |  66 ---------
 .../CompleteTopologyMessageProcessor.java       |   2 +-
 .../extension/HAProxyStatisticsReader.java      |  96 +++++++++++++
 .../haproxy/extension/HAProxyStatsReader.java   |  96 -------------
 .../apache/stratos/haproxy/extension/Main.java  |   2 +-
 .../distribution/src/main/conf/mincheck.drl     |  10 +-
 .../distribution/src/main/conf/scaling.drl      | 104 +++++++++-----
 .../integration/tests/LoginLogoutTestCase.java  |  50 +++----
 .../tests/SecurityVerificationTestCase.java     |   8 +-
 .../tests/StratosManagerTestServerManager.java  |  58 ++++----
 .../integration/tests/TenantMgtTestCase.java    | 112 +++++++--------
 tools/puppet/manifests/classes/php_cartridge.pp |   2 +
 25 files changed, 649 insertions(+), 596 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2fd5d40b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/LoadAverage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2fd5d40b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/MemoryConsumption.java
----------------------------------------------------------------------