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 2014/11/10 17:00:46 UTC

stratos git commit: Adding scaling orders to dependencies

Repository: stratos
Updated Branches:
  refs/heads/master fcdafcf63 -> 51dff131a


Adding scaling orders to dependencies


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

Branch: refs/heads/master
Commit: 51dff131a007d4103761643f3a76e752d8b7cecc
Parents: fcdafcf
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Nov 10 21:31:36 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Nov 10 21:31:36 2014 +0530

----------------------------------------------------------------------
 .../autoscaler/api/AutoScalerServiceImpl.java        | 15 +++++++++++++--
 .../apache/stratos/autoscaler/pojo/Dependencies.java | 10 ++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/51dff131/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
index 798890c..8e92f21 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
@@ -426,14 +426,25 @@ public class AutoScalerServiceImpl implements AutoScalerServiceInterface {
             String [] startupOrders = dependencies.getStartupOrders();
 
             if(log.isDebugEnabled()) {
-                log.debug("StartupOrders" + startupOrders);
+                log.debug("StartupOrders " + startupOrders);
 
                 if (startupOrders != null) {
-                    log.debug("StartupOrder:size" + startupOrders.length);
+                    log.debug("StartupOrder:size  " + startupOrders.length);
                 } else {
                     log.debug("StartupOrder: is null");
                 }
             }
+            String [] scalingOrders = dependencies.getScalingOrders();
+
+            if(log.isDebugEnabled()) {
+                log.debug("ScalingOrders " + scalingOrders);
+
+                if (startupOrders != null) {
+                    log.debug("ScalingOrder:size " + scalingOrders.length);
+                } else {
+                    log.debug("ScalingOrder: is null");
+                }
+            }
         }
 
         RegistryManager.getInstance().persistServiceGroup(servicegroup);

http://git-wip-us.apache.org/repos/asf/stratos/blob/51dff131/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java
index 551e58d..c1d6f76 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/Dependencies.java
@@ -26,6 +26,8 @@ public class Dependencies implements Serializable {
 
     private String [] startupOrders;
 
+    private String [] scalingOrders;
+
     private String terminationBehaviour;
 
     public String getTerminationBehaviour() {
@@ -43,4 +45,12 @@ public class Dependencies implements Serializable {
     public void setStartupOrders(String[] startupOrders) {
         this.startupOrders = startupOrders;
     }
+
+    public String[] getScalingOrders() {
+        return scalingOrders;
+    }
+
+    public void setScalingOrders(String[] scalingOrders) {
+        this.scalingOrders = scalingOrders;
+    }
 }