You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/10/25 07:32:47 UTC

[1/2] git commit: Updated load balancer default session timeout to 90000 and cleaned loadbalancer.conf to be updated later

Updated Branches:
  refs/heads/master bb7176680 -> 281df2a85


Updated load balancer default session timeout to 90000 and cleaned loadbalancer.conf to be updated later


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

Branch: refs/heads/master
Commit: dafa078f9968449554f9fc89fe8d76b00092b483
Parents: 3d2376f
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Oct 25 11:02:22 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Oct 25 11:02:22 2013 +0530

----------------------------------------------------------------------
 .../src/main/conf/loadbalancer.conf             | 57 --------------------
 .../synapse-configs/default/sequences/main.xml  |  2 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dafa078f/products/elb/modules/distribution/src/main/conf/loadbalancer.conf
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/conf/loadbalancer.conf b/products/elb/modules/distribution/src/main/conf/loadbalancer.conf
index eafee00..3128f1a 100644
--- a/products/elb/modules/distribution/src/main/conf/loadbalancer.conf
+++ b/products/elb/modules/distribution/src/main/conf/loadbalancer.conf
@@ -14,61 +14,4 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-# configuration details of Apache Stratos Elastic Load Balancer
-# for more info on how it works, refer to: http://blog.afkham.org/2011/09/wso2-load-balancer-how-it-works.html
-# for more info on how to set it up, refer to: http://nirmalfdo.blogspot.com/2012/06/fronting-wso2-application-server-50.html
-loadbalancer {
-    # minimum number of load balancer instances 
-    instances           1;
-    # whether autoscaling should be enabled or not.
-    enable_autoscaler   false;
-    # autoscaling decision making task
-    #autoscaler_task  org.wso2.carbon.mediator.autoscale.lbautoscale.task.ServiceRequestsInFlightAutoscaler;
-    # whether to use embedded autoscaler or not. By default, we use embedded autoscaler. 
-    #use_embedded_autoscaler false;
-    #please use this whenever url-mapping is used through LB.
-    #size_of_cache		100;
-    # End point reference of the Autoscaler Service. This should be present, if you disabled embedded autoscaling.
-    #autoscaler_service_epr  https://host_address:https_port/services/CloudControllerService/; 
-    # interval between two task executions in milliseconds 
-    autoscaler_task_interval 60000;
-    # after an instance booted up, task will wait maximum till this much of time and let the server started up
-    server_startup_delay 600000; #default will be 60000ms
-    # session time out
-    session_timeout 90000; 
-    # enable fail over 
-    fail_over true;
-    #mb_server_url localhost:5672;
-}
 
-# services' details which are fronted by this WSO2 Elastic Load Balancer
-services {
-    # default parameter values to be used in all services
-    defaults {
-        # minimum number of service instances required. WSO2 ELB will make sure that this much of instances
-        # are maintained in the system all the time, of course only when autoscaling is enabled.
-        min_app_instances       1;
-        # maximum number of service instances that will be load balanced by this ELB.
-        max_app_instances       5;
-        # you need to calibrate autoscaling parameters before start using. Please go through following blog post
-        # http://nirmalfdo.blogspot.com/2013/01/scale-up-early-scale-down-slowly.html
-        max_requests_per_second   5;
-        alarming_upper_rate 0.7;
-        alarming_lower_rate 0.2;
-        scale_down_factor 0.25;
-        rounds_to_average       2;
-        message_expiry_time     60000;
-    }
-
-    appserver {
-        hosts      appserver.cloud-test.wso2.com.aaa.demo;
-        domains   {
-            aaa.appserver.domain.bbb {
-                tenant_range    *;
-                min_app_instances       0;
-                #max_app_instances       1;
-            }
-        }
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/dafa078f/products/elb/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml b/products/elb/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
index e5e6f69..b74c6d4 100644
--- a/products/elb/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
+++ b/products/elb/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
@@ -29,7 +29,7 @@
                      <parameter name="algorithmClassName">org.apache.stratos.lb.endpoint.algorithm.RoundRobin</parameter>
                      <parameter name="failover">true</parameter>
                      <parameter name="sessionAffinity">true</parameter>
-                     <parameter name="sessionTimeout">900000</parameter>
+                     <parameter name="sessionTimeout">90000</parameter>
                      <!-- parameter name="configuration">$system:loadbalancer.conf</parameter -->
   	            </class>
  	          </endpoint>


[2/2] git commit: Merge remote-tracking branch 'origin/master'

Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 281df2a851a047e3fae4079a2ab638ab89c5e90d
Parents: dafa078 bb71766
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Oct 25 11:02:40 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Oct 25 11:02:40 2013 +0530

----------------------------------------------------------------------
 .../client/cloud/controller/CloudControllerClient.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------