Updated Branches: refs/heads/master ad210e422 -> 8893586ee
Setting timeouts for cloud controller and autoscaler clients Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8893586e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8893586e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8893586e Branch: refs/heads/master Commit: 8893586ee2f2ea0465b88c974c674e7e0f288932 Parents: ad210e4 Author: Sajith Kariyawasam <[email protected]> Authored: Wed Dec 18 11:43:16 2013 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Wed Dec 18 11:43:16 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 13 +++++++++++-- .../adc/mgt/client/CloudControllerServiceClient.java | 9 ++++++++- .../stratos/adc/mgt/utils/CartridgeConstants.java | 5 +++++ 3 files changed, 24 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8893586e/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java index 0d5e930..efdad29 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java @@ -21,6 +21,7 @@ package org.apache.stratos.adc.mgt.client; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; +import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.adc.mgt.exception.ADCException; @@ -42,11 +43,19 @@ public class AutoscalerServiceClient { private static volatile AutoscalerServiceClient serviceClient; public AutoscalerServiceClient(String epr) throws AxisFault { - + + + + String autosclaerSocketTimeout = + (System.getProperty(CartridgeConstants.AUTOSCALER_SOCKET_TIMEOUT) == null ) ? "300000": System.getProperty(CartridgeConstants.AUTOSCALER_SOCKET_TIMEOUT); + String autosclaerConnectionTimeout = + (System.getProperty(CartridgeConstants.AUTOSCALER_CONNECTION_TIMEOUT) == null ) ? "300000" : System.getProperty(CartridgeConstants.AUTOSCALER_CONNECTION_TIMEOUT) ; + ConfigurationContext clientConfigContext = DataHolder.getClientConfigContext(); try { stub = new AutoScalerServiceStub(clientConfigContext, epr); - stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, autosclaerSocketTimeout); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, autosclaerConnectionTimeout); } catch (AxisFault axisFault) { String msg = "Failed to initiate autoscaler service client. " + axisFault.getMessage(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8893586e/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java index 229026d..d9ccab3 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/CloudControllerServiceClient.java @@ -21,6 +21,7 @@ package org.apache.stratos.adc.mgt.client; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; +import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.adc.mgt.exception.UnregisteredCartridgeException; @@ -47,10 +48,16 @@ public class CloudControllerServiceClient { public CloudControllerServiceClient(String epr) throws AxisFault { + String ccSocketTimeout = + System.getProperty(CartridgeConstants.CC_SOCKET_TIMEOUT) == null ? "300000" : System.getProperty(CartridgeConstants.CC_SOCKET_TIMEOUT); + String ccConnectionTimeout = + System.getProperty(CartridgeConstants.CC_CONNECTION_TIMEOUT) == null ? "300000" : System.getProperty(CartridgeConstants.CC_CONNECTION_TIMEOUT) ; + ConfigurationContext clientConfigContext = DataHolder.getClientConfigContext(); try { stub = new CloudControllerServiceStub(clientConfigContext, epr); - stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, ccSocketTimeout); + stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, ccConnectionTimeout); } catch (AxisFault axisFault) { String msg = "Failed to initiate AutoscalerService client. " + axisFault.getMessage(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8893586e/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java index b93db7c..5c2f0de 100644 --- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java +++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java @@ -82,6 +82,11 @@ public class CartridgeConstants { public static final String INTERNAL_GIT_PASSWORD = "internal.repo.password"; public static final String CUSTOM_PAYLOAD_PARAM_NAME_PREFIX = "payload_parameter."; + + public static final String CC_SOCKET_TIMEOUT = "cc.socket.timeout"; + public static final String CC_CONNECTION_TIMEOUT = "cc.connection.timeout"; + public static final String AUTOSCALER_SOCKET_TIMEOUT = "autoscaler.socket.timeout"; + public static final String AUTOSCALER_CONNECTION_TIMEOUT = "autoscaler.connection.timeout"; public static final class DomainMappingInfo { public static final String ACTUAL_HOST = "actual.host";
