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/18 08:56:16 UTC

[1/3] stratos git commit: Adding child scaling event handlers

Repository: stratos
Updated Branches:
  refs/heads/master d52352fc5 -> cbc1105cc


Adding child scaling event handlers


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

Branch: refs/heads/master
Commit: 0e818d5cebc83fa1c32757c991a3daa493de0109
Parents: d52352f
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Nov 18 13:23:36 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Nov 18 13:23:36 2014 +0530

----------------------------------------------------------------------
 .../autoscaler/monitor/EventHandler.java        | 23 ++++++++++++---
 .../monitor/application/ApplicationMonitor.java | 19 +++++++++----
 .../autoscaler/monitor/group/GroupMonitor.java  | 30 ++++++++++++++++----
 3 files changed, 56 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/0e818d5c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
index 06c722c..c47997b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
@@ -18,6 +18,7 @@
  */
 package org.apache.stratos.autoscaler.monitor;
 
+import org.apache.stratos.autoscaler.monitor.events.ClusterScalingEvent;
 import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent;
 import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
 import org.apache.stratos.autoscaler.monitor.events.MonitorTerminateAllEvent;
@@ -27,18 +28,32 @@ import org.apache.stratos.autoscaler.monitor.events.MonitorTerminateAllEvent;
  */
 public interface EventHandler {
     /**
-     * Triggered when an event is received from a child.
+     * Triggered when a status event is received from a child.
      *
      * @param statusEvent
      */
-    public abstract void onChildEvent(MonitorStatusEvent statusEvent);
+    public abstract void onChildStatusEvent(MonitorStatusEvent statusEvent);
 
     /**
-     * Triggered when an event is received from the parent.
+     * Triggered when a status event is received from the parent.
      *
      * @param statusEvent
      */
-    public abstract void onParentEvent(MonitorStatusEvent statusEvent);
+    public abstract void onParentStatusEvent(MonitorStatusEvent statusEvent);
+
+    /**
+     * Triggered when a scaling event is received from a child.
+     *
+     * @param scalingEvent
+     */
+    public abstract void onChildScalingEvent(MonitorScalingEvent scalingEvent);
+
+    /**
+     * Triggered when a scaling event is received from the parent.
+     *
+     * @param scalingEvent
+     */
+    public abstract void onParentScalingEvent(MonitorScalingEvent scalingEvent);
 
     /**
      * Triggered when termination decision is made.

http://git-wip-us.apache.org/repos/asf/stratos/blob/0e818d5c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
index cbc56b9..8888252 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
@@ -26,10 +26,7 @@ import org.apache.stratos.autoscaler.monitor.Monitor;
 import org.apache.stratos.autoscaler.monitor.MonitorStatusEventBuilder;
 import org.apache.stratos.autoscaler.monitor.ParentComponentMonitor;
 import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor;
-import org.apache.stratos.autoscaler.monitor.events.ApplicationStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.MonitorTerminateAllEvent;
+import org.apache.stratos.autoscaler.monitor.events.*;
 import org.apache.stratos.autoscaler.status.checker.StatusChecker;
 import org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.ApplicationStatus;
@@ -146,7 +143,7 @@ public class ApplicationMonitor extends ParentComponentMonitor {
     }
 
     @Override
-    public void onChildEvent(MonitorStatusEvent statusEvent) {
+    public void onChildStatusEvent(MonitorStatusEvent statusEvent) {
         String id = statusEvent.getId();
         LifeCycleState status1 = statusEvent.getStatus();
         //Events coming from parent are In_Active(in faulty detection), Scaling events, termination
@@ -196,11 +193,21 @@ public class ApplicationMonitor extends ParentComponentMonitor {
     }
 
     @Override
-    public void onParentEvent(MonitorStatusEvent statusEvent) {
+    public void onParentStatusEvent(MonitorStatusEvent statusEvent) {
         // nothing to do
     }
 
     @Override
+    public void onChildScalingEvent(MonitorScalingEvent scalingEvent) {
+
+    }
+
+    @Override
+    public void onParentScalingEvent(MonitorScalingEvent scalingEvent) {
+
+    }
+
+    @Override
     public void onEvent(MonitorTerminateAllEvent terminateAllEvent) {
 
     }

http://git-wip-us.apache.org/repos/asf/stratos/blob/0e818d5c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
index 3ef6c3d..9655d0c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
@@ -21,16 +21,15 @@ package org.apache.stratos.autoscaler.monitor.group;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.autoscaler.AutoscalerContext;
+import org.apache.stratos.autoscaler.applications.dependency.context.ApplicationChildContext;
+import org.apache.stratos.autoscaler.applications.dependency.context.GroupChildContext;
 import org.apache.stratos.autoscaler.applications.topic.ApplicationBuilder;
 import org.apache.stratos.autoscaler.exception.DependencyBuilderException;
 import org.apache.stratos.autoscaler.exception.TopologyInConsistentException;
 import org.apache.stratos.autoscaler.monitor.EventHandler;
 import org.apache.stratos.autoscaler.monitor.MonitorStatusEventBuilder;
 import org.apache.stratos.autoscaler.monitor.ParentComponentMonitor;
-import org.apache.stratos.autoscaler.monitor.events.GroupStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.MonitorTerminateAllEvent;
+import org.apache.stratos.autoscaler.monitor.events.*;
 import org.apache.stratos.autoscaler.status.checker.StatusChecker;
 import org.apache.stratos.messaging.domain.applications.ApplicationStatus;
 import org.apache.stratos.messaging.domain.applications.Group;
@@ -63,7 +62,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler
     }
 
     @Override
-    public void onChildEvent(MonitorStatusEvent statusEvent) {
+    public void onChildStatusEvent(MonitorStatusEvent statusEvent) {
         String id = statusEvent.getId();
         LifeCycleState status1 = statusEvent.getStatus();
         //Events coming from parent are In_Active(in faulty detection), Scaling events, termination
@@ -115,7 +114,7 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler
     }
 
     @Override
-    public void onParentEvent(MonitorStatusEvent statusEvent) {
+    public void onParentStatusEvent(MonitorStatusEvent statusEvent) {
         // send the ClusterTerminating event
         if (statusEvent.getStatus() == GroupStatus.Terminating || statusEvent.getStatus() ==
                 ApplicationStatus.Terminating) {
@@ -124,6 +123,25 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler
     }
 
     @Override
+    public void onChildScalingEvent(MonitorScalingEvent scalingEvent) {
+
+        GroupChildContext groupChildContext=
+                (GroupChildContext) scalingDependencyTree.findApplicationContextWithIdInScalingDependencyTree(id);
+        if (groupChildContext.hasScalingDependents()){
+
+            for (ApplicationChildContext applicationChildContext : groupChildContext.getApplicationChildContextList()){
+
+            }
+        }
+    }
+
+    @Override
+    public void onParentScalingEvent(MonitorScalingEvent scalingEvent) {
+
+        //
+    }
+
+    @Override
     public void onEvent(MonitorTerminateAllEvent terminateAllEvent) {
         this.terminateChildren = true;
 


[2/3] stratos git commit: updating cluster monitors to handle scaling dependent case

Posted by la...@apache.org.
updating cluster monitors to handle scaling dependent case


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

Branch: refs/heads/master
Commit: 635ba15d944be7165c28d52035715d751d8ef3c8
Parents: 0e818d5
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Nov 18 13:26:37 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Nov 18 13:26:37 2014 +0530

----------------------------------------------------------------------
 .../monitor/MonitorStatusEventBuilder.java      | 25 ++++++--
 .../monitor/cluster/AbstractClusterMonitor.java |  4 +-
 .../KubernetesServiceClusterMonitor.java        | 12 ++++
 .../monitor/cluster/VMLbClusterMonitor.java     | 10 +++
 .../cluster/VMServiceClusterMonitor.java        | 67 +++++++++++++++++++-
 5 files changed, 108 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/635ba15d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java
index dac53b4..5d1f87a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorStatusEventBuilder.java
@@ -20,10 +20,7 @@ package org.apache.stratos.autoscaler.monitor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.autoscaler.monitor.events.ApplicationStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.ClusterStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.GroupStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
+import org.apache.stratos.autoscaler.monitor.events.*;
 import org.apache.stratos.messaging.domain.applications.ApplicationStatus;
 import org.apache.stratos.messaging.domain.topology.ClusterStatus;
 import org.apache.stratos.messaging.domain.applications.GroupStatus;
@@ -49,13 +46,29 @@ public class MonitorStatusEventBuilder {
         notifyParent(parent, applicationStatusEvent);
     }
 
+    public static void handleClusterScalingEvent(ParentComponentMonitor parent, float factor, String appId) {
+
+        //Send notifications to parent of the cluster monitor
+    }
+
     private static void notifyParent(ParentComponentMonitor parent, MonitorStatusEvent statusEvent) {
-        parent.onChildEvent(statusEvent);
+        parent.onChildStatusEvent(statusEvent);
     }
 
     public static void notifyChildren (ParentComponentMonitor componentMonitor, MonitorStatusEvent statusEvent) {
         for (Monitor activeChildMonitor : componentMonitor.getAliasToActiveMonitorsMap().values()) {
-            activeChildMonitor.onParentEvent(statusEvent);
+            activeChildMonitor.onParentStatusEvent(statusEvent);
+        }
+    }
+
+    private static void notifyParent(ParentComponentMonitor parent, MonitorScalingEvent scalingEvent) {
+        parent.onChildScalingEvent(scalingEvent);
+    }
+
+    public static void notifyChildren (ParentComponentMonitor componentMonitor, MonitorScalingEvent scalingEvent) {
+        for (Monitor activeChildMonitor : componentMonitor.getAliasToActiveMonitorsMap().values()) {
+            activeChildMonitor.onParentScalingEvent(scalingEvent);
         }
     }
+
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/635ba15d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java
index 701de48..a201a44 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/AbstractClusterMonitor.java
@@ -299,7 +299,7 @@ public abstract class AbstractClusterMonitor extends Monitor implements Runnable
     }
 
     @Override
-    public void onParentEvent(MonitorStatusEvent statusEvent) {
+    public void onParentStatusEvent(MonitorStatusEvent statusEvent) {
         // send the ClusterTerminating event
 //        if (statusEvent.getStatus() == GroupStatus.Terminating || statusEvent.getStatus() ==
 //                ApplicationStatus.Terminating) {
@@ -308,7 +308,7 @@ public abstract class AbstractClusterMonitor extends Monitor implements Runnable
     }
 
     @Override
-    public void onChildEvent(MonitorStatusEvent statusEvent) {
+    public void onChildStatusEvent(MonitorStatusEvent statusEvent) {
 
     }
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/635ba15d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java
index 4944b47..1921d95 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/KubernetesServiceClusterMonitor.java
@@ -26,6 +26,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.autoscaler.KubernetesClusterContext;
 import org.apache.stratos.autoscaler.exception.InvalidArgumentException;
+import org.apache.stratos.autoscaler.monitor.events.ClusterScalingEvent;
+import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent;
 import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
 import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator;
 import org.apache.stratos.autoscaler.util.AutoScalerConstants;
@@ -211,4 +213,14 @@ public final class KubernetesServiceClusterMonitor extends KubernetesClusterMoni
             
         }
     }
+
+    @Override
+    public void onChildScalingEvent(MonitorScalingEvent scalingEvent) {
+
+    }
+
+    @Override
+    public void onParentScalingEvent(MonitorScalingEvent scalingEvent) {
+
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/635ba15d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMLbClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMLbClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMLbClusterMonitor.java
index fff4a52..4c4b53b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMLbClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMLbClusterMonitor.java
@@ -28,6 +28,7 @@ import org.apache.stratos.autoscaler.NetworkPartitionContext;
 import org.apache.stratos.autoscaler.NetworkPartitionLbHolder;
 import org.apache.stratos.autoscaler.PartitionContext;
 import org.apache.stratos.autoscaler.VMClusterContext;
+import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent;
 import org.apache.stratos.autoscaler.partition.PartitionManager;
 import org.apache.stratos.autoscaler.policy.PolicyManager;
 import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
@@ -172,4 +173,13 @@ public class VMLbClusterMonitor extends VMClusterMonitor {
         return "VMLbClusterMonitor [clusterId=" + getClusterId() + "]";
     }
 
+    @Override
+    public void onChildScalingEvent(MonitorScalingEvent scalingEvent) {
+
+    }
+
+    @Override
+    public void onParentScalingEvent(MonitorScalingEvent scalingEvent) {
+
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/635ba15d/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
index 4bbfd4d..9992b67 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMServiceClusterMonitor.java
@@ -23,8 +23,12 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.autoscaler.NetworkPartitionContext;
 import org.apache.stratos.autoscaler.PartitionContext;
+import org.apache.stratos.autoscaler.VMClusterContext;
 import org.apache.stratos.autoscaler.VMServiceClusterContext;
 import org.apache.stratos.autoscaler.event.publisher.ClusterStatusEventPublisher;
+import org.apache.stratos.autoscaler.monitor.MonitorStatusEventBuilder;
+import org.apache.stratos.autoscaler.monitor.events.ClusterScalingEvent;
+import org.apache.stratos.autoscaler.monitor.events.MonitorScalingEvent;
 import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
 import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator;
 import org.apache.stratos.autoscaler.util.AutoScalerConstants;
@@ -50,6 +54,7 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
     private static final Log log = LogFactory.getLog(VMServiceClusterMonitor.class);
     private String lbReferenceType;
     private boolean hasPrimary;
+    private float scalingFactorBasedOnDependencies = 1.0f;
 
     public VMServiceClusterMonitor(String clusterId, VMServiceClusterContext vmServiceClusterContext) {
         super(clusterId, new AutoscalerRuleEvaluator(
@@ -151,6 +156,41 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
 
 
             }
+        	boolean rifReset = networkPartitionContext.isRifReset();
+            boolean memoryConsumptionReset = networkPartitionContext.isMemoryConsumptionReset();
+            boolean loadAverageReset = networkPartitionContext.isLoadAverageReset();
+
+            if (log.isDebugEnabled()) {
+                log.debug("flag of rifReset: " + rifReset + " flag of memoryConsumptionReset" + memoryConsumptionReset
+                        + " flag of loadAverageReset" + loadAverageReset);
+            }
+            if (rifReset || memoryConsumptionReset || loadAverageReset) {
+
+                VMClusterContext vmClusterContext = (VMClusterContext) clusterContext;
+                getScaleCheckKnowledgeSession().setGlobal("clusterId", getClusterId());
+                getScaleCheckKnowledgeSession().setGlobal("autoscalePolicy", vmClusterContext.getAutoscalePolicy());
+                getScaleCheckKnowledgeSession().setGlobal("rifReset", rifReset);
+                getScaleCheckKnowledgeSession().setGlobal("mcReset", memoryConsumptionReset);
+                getScaleCheckKnowledgeSession().setGlobal("laReset", loadAverageReset);
+                getScaleCheckKnowledgeSession().setGlobal("lbRef", lbReferenceType);
+                getScaleCheckKnowledgeSession().setGlobal("isPrimary", false);
+                getScaleCheckKnowledgeSession().setGlobal("primaryMembers", primaryMemberListInNetworkPartition);
+
+                if (log.isDebugEnabled()) {
+                    log.debug(String.format("Running scale check for network partition %s ", networkPartitionContext.getId()));
+                    log.debug(" Primary members : " + primaryMemberListInNetworkPartition);
+                }
+
+                scaleCheckFactHandle = AutoscalerRuleEvaluator.evaluateScaleCheck(getScaleCheckKnowledgeSession()
+                        , scaleCheckFactHandle, networkPartitionContext);
+
+                networkPartitionContext.setRifReset(false);
+                networkPartitionContext.setMemoryConsumptionReset(false);
+                networkPartitionContext.setLoadAverageReset(false);
+            } else if (log.isDebugEnabled()) {
+                log.debug(String.format("Scale rule will not run since the LB statistics have not received before this " +
+                        "cycle for network partition %s", networkPartitionContext.getId()));
+            }
 
         }
     }
@@ -201,12 +241,12 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
     }
 
     @Override
-    public void onChildEvent(MonitorStatusEvent statusEvent) {
+    public void onChildStatusEvent(MonitorStatusEvent statusEvent) {
 
     }
 
     @Override
-    public void onParentEvent(MonitorStatusEvent statusEvent) {
+    public void onParentStatusEvent(MonitorStatusEvent statusEvent) {
         // send the ClusterTerminating event
         if (statusEvent.getStatus() == GroupStatus.Terminating || statusEvent.getStatus() ==
                 ApplicationStatus.Terminating) {
@@ -217,4 +257,27 @@ public class VMServiceClusterMonitor extends VMClusterMonitor {
             ClusterStatusEventPublisher.sendClusterTerminatingEvent(getAppId(), getServiceId(), getClusterId());
         }
     }
+
+    @Override
+    public void onChildScalingEvent(MonitorScalingEvent scalingEvent) {
+
+    }
+
+    @Override
+    public void onParentScalingEvent(MonitorScalingEvent scalingEvent) {
+        this.scalingFactorBasedOnDependencies = scalingEvent.getFactor();
+
+        for(NetworkPartitionContext networkPartitionContext : getNetworkPartitionCtxts().values()){
+
+            float requiredInstanceCount = networkPartitionContext.getMinInstanceCount() * scalingFactorBasedOnDependencies;
+            int roundedRequiredInstanceCount = getRoundedInstanceCount(requiredInstanceCount, 0);
+            networkPartitionContext.setRequiredInstanceCount(roundedRequiredInstanceCount);
+            //TODO get instance count rounding fraction(0) as a part of Autoscaling policy
+        }
+    }
+
+    public void sendClusterScalingEvent(float factor) {
+
+        MonitorStatusEventBuilder.handleClusterScalingEvent(this.parent, factor, this.id);
+    }
 }


[3/3] stratos git commit: Calculating the factor of scaling at cluster and passing it to dependents

Posted by la...@apache.org.
Calculating the factor of scaling at cluster and passing it to dependents


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

Branch: refs/heads/master
Commit: cbc1105ccc891e8a2af88568e53aa07a576d0832
Parents: 635ba15
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Nov 18 13:27:18 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Nov 18 13:27:18 2014 +0530

----------------------------------------------------------------------
 .../AutoscalerTopologyEventReceiver.java         |  5 +----
 .../monitor/events/MonitorScalingEvent.java      |  9 +++++++++
 .../autoscaler/rule/RuleTasksDelegator.java      | 19 +++++++++++++++++--
 .../src/main/conf/drools/scaling.drl             | 10 +++++++++-
 4 files changed, 36 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/cbc1105c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
index d14b8f1..5296d75 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -23,7 +23,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.stratos.autoscaler.AutoscalerContext;
 import org.apache.stratos.autoscaler.applications.ApplicationHolder;
-import org.apache.stratos.autoscaler.applications.topic.ApplicationsEventPublisher;
 import org.apache.stratos.autoscaler.event.publisher.ClusterStatusEventPublisher;
 import org.apache.stratos.autoscaler.event.publisher.InstanceNotificationPublisher;
 import org.apache.stratos.autoscaler.exception.DependencyBuilderException;
@@ -31,9 +30,7 @@ import org.apache.stratos.autoscaler.exception.TopologyInConsistentException;
 import org.apache.stratos.autoscaler.monitor.application.ApplicationMonitor;
 import org.apache.stratos.autoscaler.monitor.application.ApplicationMonitorFactory;
 import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor;
-import org.apache.stratos.autoscaler.monitor.events.ApplicationStatusEvent;
 import org.apache.stratos.autoscaler.monitor.events.ClusterStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
 import org.apache.stratos.autoscaler.status.checker.StatusChecker;
 import org.apache.stratos.messaging.domain.applications.Application;
 import org.apache.stratos.messaging.domain.applications.Applications;
@@ -311,7 +308,7 @@ public class AutoscalerTopologyEventReceiver implements Runnable {
                     // if the cluster monitor is null, assume that its termianted
                     ApplicationMonitor appMonitor = AutoscalerContext.getInstance().getAppMonitor(clusterTerminatedEvent.getAppId());
                     if (appMonitor != null)  {
-                        appMonitor.onChildEvent(new ClusterStatusEvent(ClusterStatus.Terminated, clusterId));
+                        appMonitor.onChildStatusEvent(new ClusterStatusEvent(ClusterStatus.Terminated, clusterId));
                     }
                     return;
                 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/cbc1105c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorScalingEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorScalingEvent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorScalingEvent.java
index ce7b311..2083c55 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorScalingEvent.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorScalingEvent.java
@@ -23,8 +23,17 @@ package org.apache.stratos.autoscaler.monitor.events;
  */
 public abstract class MonitorScalingEvent extends MonitorEvent {
 
+    private float factor;
+
     public  MonitorScalingEvent(String id) {
         super(id);
     }
 
+    public float getFactor() {
+        return factor;
+    }
+
+    public void setFactor(float factor) {
+        this.factor = factor;
+    }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/cbc1105c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
index 0961693..f60417f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
@@ -31,6 +31,9 @@ import org.apache.stratos.autoscaler.client.CloudControllerClient;
 import org.apache.stratos.autoscaler.client.InstanceNotificationClient;
 import org.apache.stratos.autoscaler.exception.SpawningException;
 import org.apache.stratos.autoscaler.exception.TerminationException;
+import org.apache.stratos.autoscaler.monitor.MonitorStatusEventBuilder;
+import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor;
+import org.apache.stratos.autoscaler.monitor.cluster.VMServiceClusterMonitor;
 import org.apache.stratos.autoscaler.partition.PartitionManager;
 import org.apache.stratos.cloud.controller.stub.pojo.MemberContext;
 import org.apache.stratos.messaging.domain.topology.Cluster;
@@ -176,8 +179,6 @@ public class RuleTasksDelegator {
                     log.debug(String.format("Pending member added, [member] %s [partition] %s", memberContext.getMemberId(),
                             memberContext.getPartition().getId()));
                 }
-                //Notify parent for checking scaling dependencies
-
 
             } else if(log.isDebugEnabled()){
                 log.debug("Returned member context is null, did not add to pending members");
@@ -190,6 +191,20 @@ public class RuleTasksDelegator {
         }
     }
 
+
+    public void delegateScalingDependencyNotification(String clusterId, float factor) {
+
+
+        //Notify parent for checking scaling dependencies
+        AbstractClusterMonitor clusterMonitor = AutoscalerContext.getInstance().getClusterMonitor(clusterId);
+        if(clusterMonitor instanceof VMServiceClusterMonitor) {
+
+            VMServiceClusterMonitor vmServiceClusterMonitor = (VMServiceClusterMonitor) clusterMonitor;
+            vmServiceClusterMonitor.sendClusterScalingEvent(factor);
+        }
+
+    }
+
     // Original method. Assume this is invoked from mincheck.drl
     
    /* public void delegateSpawn(PartitionContext partitionContext, String clusterId, String lbRefType) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/cbc1105c/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
index d7143fa..0b1f112 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -127,7 +127,12 @@ dialect "mvel"
 
             int additionalInstances = numberOfRequiredInstances - instancesCount ;
             $networkPartitionContext.resetScaleDownRequestsCount();
-            int count=0;
+            int count = 0;
+
+            //Calculating the factor scaling
+            float factor = numberOfRequiredInstances / $networkPartitionContext.getMinInstanceCount();
+            $delegator.delegateScalingDependencyNotification(clusterId, factor);
+
             while(count != additionalInstances){
             Partition partition =  autoscaleAlgorithm.getNextScaleUpPartition($networkPartitionContext, clusterId);
             if(partition != null){
@@ -139,6 +144,9 @@ dialect "mvel"
           }    
         } else if(scaleDown){
 
+            float factor = numberOfRequiredInstances / $networkPartitionContext.getMinInstanceCount();
+            $delegator.delegateScalingDependencyNotification(clusterId, factor);
+
             log.debug("[scale-down] Decided to Scale down [cluster] " + clusterId);
             if($networkPartitionContext.getScaleDownRequestsCount() > 5 ){
                 log.debug("[scale-down] Reached scale down requests threshold [cluster] " + clusterId + " Count " + $networkPartitionContext.getScaleDownRequestsCount());