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/18 07:17:57 UTC
[1/2] git commit: adding correct cloud controller client timeout
config file change
Updated Branches:
refs/heads/master 8893586ee -> f8dc515cd
adding correct cloud controller client timeout config file change
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2b33e916
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2b33e916
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2b33e916
Branch: refs/heads/master
Commit: 2b33e916fb78a5ada4e2335a404192e27994729b
Parents: 4581537
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 18 11:51:40 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 18 11:51:40 2013 +0530
----------------------------------------------------------------------
.../client/cloud/controller/CloudControllerClient.java | 5 +++--
.../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 3 ++-
.../modules/distribution/src/main/conf/autoscaler.xml | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2b33e916/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
index 538e4b7..78d6ce4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
@@ -19,6 +19,7 @@
package org.apache.stratos.autoscaler.client.cloud.controller;
+import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -64,8 +65,8 @@ public class CloudControllerClient {
String epr = "https://" + hostname + ":" + port + "/" + Constants.CLOUD_CONTROLLER_SERVICE_SFX ;
int cloudControllerClientTimeout = conf.getInt("autoscaler.cloudController.clientTimeout", 180000);
stub = new CloudControllerServiceStub(epr);
- stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(cloudControllerClientTimeout);
-
+ stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, cloudControllerClientTimeout);
+ stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, cloudControllerClientTimeout);
} catch (Exception e) {
log.error("Stub init error", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2b33e916/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 0f20f4d..d0a1f84 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -134,6 +134,7 @@ public class AutoscalerUtil {
networkPartitionContext.increaseMemberCountInPartitionBy(partition.getId(), 1);
} else if(MemberStatus.Created.equals(member.getStatus()) || MemberStatus.Starting.equals(member.getStatus())){
partitionContext.addPendingMember(memberContext);
+
networkPartitionContext.increaseMemberCountInPartitionBy(partition.getId(), 1);
} else if(MemberStatus.Suspended.equals(member.getStatus())){
partitionContext.addFaultyMember(memberId);
@@ -214,7 +215,7 @@ public class AutoscalerUtil {
for (Member member : cluster.getMembers()) {
String memberId = member.getMemberId();
- if (member.getPartitionId().equalsIgnoreCase(networkPartitionContext.getId())) {
+ if (member.getNetworkPartitionId().equalsIgnoreCase(networkPartitionContext.getId())) {
MemberContext memberContext = new MemberContext();
memberContext.setClusterId(member.getClusterId());
memberContext.setMemberId(memberId);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2b33e916/products/autoscaler/modules/distribution/src/main/conf/autoscaler.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/conf/autoscaler.xml b/products/autoscaler/modules/distribution/src/main/conf/autoscaler.xml
index 5510b97..87b3f78 100644
--- a/products/autoscaler/modules/distribution/src/main/conf/autoscaler.xml
+++ b/products/autoscaler/modules/distribution/src/main/conf/autoscaler.xml
@@ -28,6 +28,7 @@
<cloudController>
<hostname>localhost</hostname>
<port>9444</port>
+ <clientTimeout>300000</clientTimeout>
</cloudController>
</autoscaler>
</configuration>
[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/f8dc515c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f8dc515c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f8dc515c
Branch: refs/heads/master
Commit: f8dc515cd86e30ba0f56f857ffc268f8d5d74172
Parents: 2b33e91 8893586
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 18 11:52:27 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 18 11:52:27 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 13 +++-
.../client/CloudControllerServiceClient.java | 9 ++-
.../adc/mgt/utils/CartridgeConstants.java | 5 ++
.../autoscaler/policy/PolicyManager.java | 5 +-
.../apache/stratos/cli/DeploymentPolicy.java | 31 +++++++++
.../stratos/cli/RestCommandLineService.java | 68 ++++++++++++++++++++
.../apache/stratos/cli/StratosApplication.java | 3 +
.../cli/commands/AutoscalePolicyCommand.java | 3 -
.../cli/commands/DeploymentPolicyCommand.java | 48 ++++++++++++++
.../apache/stratos/cli/utils/CliConstants.java | 9 ++-
10 files changed, 184 insertions(+), 10 deletions(-)
----------------------------------------------------------------------