CurveFitting GSoC - 2015

components/org.apache.stratos.autoscaler/pom.xml

@@ -17,31 +17,27 @@
        specific language governing permissions and limitations
        under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.stratos</groupId>
         <artifactId>stratos-components-parent</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.2-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>org.apache.stratos.autoscaler</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Stratos - Autoscaler</name>
     <description>Autoscaler components</description>
-    <url>http://apache.org</url>
 
     <dependencies>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.registry.core</artifactId>
-            <version>${carbon.platform.version}</version>
+            <version>${carbon.kernel.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
@@ -102,16 +98,6 @@
             <artifactId>mvel2</artifactId>
             <version>2.1.3.Final</version>
         </dependency>
-        <!--dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.6.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.4</version>
-        </dependency-->
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-verifier</artifactId>
@@ -162,7 +148,7 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.utils</artifactId>
-            <version>${wso2carbon.version}</version>
+            <version>${carbon.kernel.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -175,7 +161,7 @@
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.ntask.core</artifactId>
             <scope>provided</scope>
-            <version>${wso2carbon.version}</version>
+            <version>${carbon.kernel.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.stratos</groupId>
@@ -195,7 +181,7 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
-            <version>${wso2carbon.version}</version>
+            <version>${carbon.kernel.version}</version>
         </dependency>
         <dependency>
             <groupId>com.nimbusds.wso2</groupId>
@@ -213,7 +199,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -223,7 +208,6 @@
                         <Export-Package>!org.apache.stratos.autoscaler.internal.*,org.apache.stratos.autoscaler.*
                         </Export-Package>
                         <Import-Package>
-                            org.osgi.framework.*;resolution:=optional,
                             org.apache.stratos.common.services.*; version="${project.version}",
                             *;resolution:=optional
                         </Import-Package>
@@ -260,7 +244,4 @@
             </resource>
         </resources>
     </build>
-    <properties>
-        <drools.version>5.5.0.Final</drools.version>
-    </properties>
-</project>
+</project>

components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/partition/RoundRobin.java

@@ -93,7 +93,7 @@ public PartitionContext getNextScaleDownPartitionContext(PartitionContext[] part
             }
         }
 
-        if (partitionContexts[selectedIndex].getNonTerminatedMemberCount() < partitionContexts[selectedIndex].getMax()) {
+        if (partitionContexts[selectedIndex].getNonTerminatedMemberCount() <= partitionContexts[selectedIndex].getMax()) {
 
             if (log.isDebugEnabled()) {
                 log.debug(String.format("[round-robin algorithm] [scale-down] [partition] %s has has members that" +

components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationHolder.java

@@ -71,17 +71,16 @@ public static Applications getApplications() {
         if (applications == null) {
             synchronized (ApplicationHolder.class) {
                 if (applications == null) {
+                    // create a new Applications object for autoscaler
+                    applications = new Applications();
+
                     // retrieve from registry
                     if (log.isDebugEnabled()) {
-                        log.debug("Trying to retrieve applications from registry...");
+                        log.debug("Loading applications persisted in registry...");
                     }
-                    applications = AutoscalerUtil.getApplications();
-                    if (applications == null) {
-                        if (log.isDebugEnabled()) {
-                            log.debug("No applications found in registry");
-                        }
-                        // create a new Applications object
-                        applications = new Applications();
+                    applications = AutoscalerUtil.loadApplicationsFromRegistry(applications);
+                    if (applications.getApplications().isEmpty()) {
+                        log.info("No applications found in registry.");
                     }
                 }
             }

components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java

@@ -37,11 +37,11 @@
 import java.util.regex.Pattern;
 
 public class ApplicationUtils {
-    private static final Log log = LogFactory.getLog(ApplicationUtils.class);
-
     public static final String TOKEN_PAYLOAD_PARAM_NAME = "TOKEN";
     public static final String DEPLOYMENT = "DEPLOYMENT";
+    private static final String PORT_SEPARATOR="|";
     public static final String PAYLOAD_PARAMETER = "payload_parameter.";
+    private static final Log log = LogFactory.getLog(ApplicationUtils.class);
     public static Pattern ALIAS_PATTERN = Pattern.compile("([a-z0-9]+([-][a-z0-9])*)+");
 
     public static boolean isAliasValid(String alias) {
@@ -76,7 +76,13 @@ public static Properties getGlobalPayloadData() {
         return globalProperties;
     }
 
-    private static String createPortMappingPayloadString(Cartridge cartridge) {
+    /**
+     * This method creates payload string with port numbers in
+     * 'PORTS': '9443|8280|8243' format
+     * @param cartridge
+     * @return String containing ports
+     */
+    private static String createPortsToPayloadString(Cartridge cartridge) {
 
         // port mappings
         StringBuilder portMapBuilder = new StringBuilder();
@@ -88,8 +94,7 @@ private static String createPortMappingPayloadString(Cartridge cartridge) {
         }
 
         for (PortMapping portMapping : portMappings) {
-            int port = portMapping.getPort();
-            portMapBuilder.append(port).append("|");
+            portMapBuilder.append(portMapping.getPort()).append(PORT_SEPARATOR);
         }
 
         // remove last "|" character
@@ -98,6 +103,39 @@ private static String createPortMappingPayloadString(Cartridge cartridge) {
         return portMappingString;
     }
 
+    /**
+     * This method creates payload string with port mappings in following format.
+     * PORT_MAPPINGS='NAME:mgt-console|PROTOCOL:https|PORT:30649|PROXY_PORT:0|TYPE:NodePort;
+     * NAME:pt-http|PROTOCOL:http|PORT:30650|PROXY_PORT:0|TYPE:NodePort;
+     * NAME:pt-https|PROTOCOL:https|PORT:30651|PROXY_PORT:0|TYPE:NodePort
+     * @param cartridge
+     * @return string containing port mapping
+     */
+    private static String createPortMappingsToPayloadString(Cartridge cartridge) {
+
+        // port mappings
+        StringBuilder portMapBuilder = new StringBuilder();
+        PortMapping[] portMappings = cartridge.getPortMappings();
+
+        if (cartridge.getPortMappings()[0] == null) {
+            // first element is null, which means no port mappings.
+            return null;
+        }
+
+        for (PortMapping portMapping : portMappings) {
+            int port = portMapping.getPort();
+            //Format : NAME:mgt-console|PROTOCOL:https|PORT:30649|PROXY_PORT:0|TYPE:NodePort;
+            portMapBuilder.append(String.format("NAME:%s|PROTOCOL:%s|PORT:%d|PROXY_PORT:%d|TYPE:%s;",
+                    portMapping.getName(), portMapping.getProtocol(),
+                    portMapping.getPort(), portMapping.getProxyPort(),
+                    portMapping.getKubernetesPortType()));
+        }
+        //remove last ";" character
+        String portMappingString = portMapBuilder.toString().replaceAll(";$", "");
+        return portMappingString;
+
+    }
+
     public static StringBuilder getTextPayload(String appId, String groupName, String clusterId) {
 
         StringBuilder payloadBuilder = new StringBuilder();
@@ -139,12 +177,12 @@ public static StringBuilder getTextPayload(String appId, String groupName, Strin
     public static PayloadData createPayload(String appId, String groupName, Cartridge cartridge, String subscriptionKey, int tenantId, String clusterId,
                                             String hostName, String repoUrl, String alias, Map<String, String> customPayloadEntries, String[] dependencyAliases,
                                             org.apache.stratos.common.Properties properties, String oauthToken, String[] dependencyClusterIDs,
-                                            String[] exportMetadata, String[] importMetadata,String lvsVirtualIP)
+                                            String[] exportMetadata, String[] importMetadata, String lvsVirtualIP)
             throws ApplicationDefinitionException {
 
         //Create the payload
         BasicPayloadData basicPayloadData = createBasicPayload(appId, groupName, cartridge, subscriptionKey,
-                clusterId, hostName, repoUrl, alias, tenantId, dependencyAliases, dependencyClusterIDs, exportMetadata, importMetadata,lvsVirtualIP);
+                clusterId, hostName, repoUrl, alias, tenantId, dependencyAliases, dependencyClusterIDs, exportMetadata, importMetadata, lvsVirtualIP);
         //Populate the basic payload details
         basicPayloadData.populatePayload();
 
@@ -212,7 +250,7 @@ private static BasicPayloadData createBasicPayload(String appId, String groupNam
                                                        String subscriptionKey, String clusterId,
                                                        String hostName, String repoUrl, String alias,
                                                        int tenantId, String[] dependencyAliases, String[] dependencyCLusterIDs,
-                                                       String[] exportMetadata, String[] importMetadata,String lvsVirtualIP) {
+                                                       String[] exportMetadata, String[] importMetadata, String lvsVirtualIP) {
 
         BasicPayloadData basicPayloadData = new BasicPayloadData();
         basicPayloadData.setAppId(appId);
@@ -221,10 +259,11 @@ private static BasicPayloadData createBasicPayload(String appId, String groupNam
         basicPayloadData.setSubscriptionKey(subscriptionKey);
         //basicPayloadData.setDeployment("default");//currently hard coded to default
         basicPayloadData.setMultitenant(String.valueOf(cartridge.getMultiTenant()));
-        basicPayloadData.setPortMappings(createPortMappingPayloadString(cartridge));
+        basicPayloadData.setPorts(createPortsToPayloadString(cartridge));
+        basicPayloadData.setPortMappings(createPortMappingsToPayloadString(cartridge));
         basicPayloadData.setServiceName(cartridge.getType());
         basicPayloadData.setProvider(cartridge.getProvider());
-	    basicPayloadData.setLvsVirtualIP(lvsVirtualIP);
+        basicPayloadData.setLvsVirtualIP(lvsVirtualIP);
 
         if (repoUrl != null) {
             basicPayloadData.setGitRepositoryUrl(repoUrl);

components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java

@@ -39,14 +39,30 @@ private DependencyBuilder() {
 
     }
 
-    private static class Holder {
-        private static final DependencyBuilder INSTANCE = new DependencyBuilder();
-    }
-
     public static DependencyBuilder getInstance() {
         return Holder.INSTANCE;
     }
 
+    /**
+     * Utility method to get the group alias from the startup order Eg: group.mygroup
+     *
+     * @param startupOrder startup order
+     * @return group alias
+     */
+    public static String getGroupFromStartupOrder(String startupOrder) {
+        return startupOrder.substring(AutoscalerConstants.GROUP.length() + 1);
+    }
+
+    /**
+     * Utility method to get the cluster alias from startup order Eg: cartridge.myphp
+     *
+     * @param startupOrder startup order
+     * @return cluster alias
+     */
+    public static String getClusterFromStartupOrder(String startupOrder) {
+        return startupOrder.substring(AutoscalerConstants.CARTRIDGE.length() + 1);
+    }
+
     /**
      * This will build the dependency tree based on the given dependencies
      *
@@ -236,23 +252,7 @@ public Set<ScalingDependentList> buildScalingDependencies(ParentComponent compon
         return scalingDependentLists;
     }
 
-    /**
-     * Utility method to get the group alias from the startup order Eg: group.mygroup
-     *
-     * @param startupOrder startup order
-     * @return group alias
-     */
-    public static String getGroupFromStartupOrder(String startupOrder) {
-        return startupOrder.substring(AutoscalerConstants.GROUP.length() + 1);
-    }
-
-    /**
-     * Utility method to get the cluster alias from startup order Eg: cartridge.myphp
-     *
-     * @param startupOrder startup order
-     * @return cluster alias
-     */
-    public static String getClusterFromStartupOrder(String startupOrder) {
-        return startupOrder.substring(AutoscalerConstants.CARTRIDGE.length() + 1);
+    private static class Holder {
+        private static final DependencyBuilder INSTANCE = new DependencyBuilder();
     }
 }

components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyTree.java

@@ -230,10 +230,6 @@ public List<ApplicationChildContext> findAllChildrenOfAppContext() {
                 allChildrenOfAppContext);
     }
 
-    public void setTerminationBehavior(TerminationBehavior terminationBehavior) {
-        this.terminationBehavior = terminationBehavior;
-    }
-
     public boolean isTerminateDependent() {
         return this.getTerminationBehavior() == TerminationBehavior.TERMINATE_DEPENDENT;
     }
@@ -242,13 +238,12 @@ public boolean isTerminateAll() {
         return this.getTerminationBehavior() == TerminationBehavior.TERMINATE_ALL;
     }
 
-
     public TerminationBehavior getTerminationBehavior() {
         return terminationBehavior;
     }
 
-    public enum TerminationBehavior {
-        TERMINATE_ALL, TERMINATE_NONE, TERMINATE_DEPENDENT
+    public void setTerminationBehavior(TerminationBehavior terminationBehavior) {
+        this.terminationBehavior = terminationBehavior;
     }
 
     public String getId() {
@@ -281,4 +276,8 @@ private void buildTreeStructure(ApplicationChildContext applicationChildContext,
             }
         }
     }
+
+    public enum TerminationBehavior {
+        TERMINATE_ALL, TERMINATE_NONE, TERMINATE_DEPENDENT
+    }
 }

components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContext.java

@@ -29,17 +29,16 @@
  */
 public abstract class ApplicationChildContext {
 
-    private String id;
     protected boolean started;
+    protected boolean hasStartupDependents;
+    protected boolean isGroupScalingEnabled;
+    private String id;
     private boolean terminated;
     private ClusterStatus status;
     private Stack<ClusterStatus> statusLifeCycle;
     private List<ApplicationChildContext> applicationChildContextList;
     private ApplicationChildContext parent;
 
-    protected boolean hasStartupDependents;
-    protected boolean isGroupScalingEnabled;
-
     public ApplicationChildContext(String id, boolean killDependent) {
         applicationChildContextList = new ArrayList<ApplicationChildContext>();
         statusLifeCycle = new Stack<ClusterStatus>();