You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/10/08 12:05:56 UTC
[1/2] git commit: add Http connection manager
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping 02bb3863a -> 1e7c6006f
add Http connection manager
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c3105c89
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c3105c89
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c3105c89
Branch: refs/heads/4.0.0-grouping
Commit: c3105c89c619ff8a85e339c64442974f4d062e5d
Parents: 4bd661e
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Oct 8 15:33:59 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Oct 8 15:33:59 2014 +0530
----------------------------------------------------------------------
.../metadata/client/rest/DefaultRestClient.java | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c3105c89/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
index 64e2567..a6f0fb4 100644
--- a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
+++ b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
@@ -29,11 +29,14 @@ import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.HttpClientConnectionManager;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.stratos.metadata.client.config.MetaDataClientConfig;
import org.apache.stratos.metadata.client.exception.RestClientException;
@@ -46,6 +49,9 @@ import java.security.NoSuchAlgorithmException;
public class DefaultRestClient implements RestClient {
private static final String APPLICATION_JSON = "application/json";
+ public static final int MAX_TOTAL_CONNECTIONS = 100;
+ public static final int DEFAULT_MAX_PER_ROUTE = 20;
+
private static Log log = LogFactory.getLog(DefaultRestClient.class);
private HttpClient httpClient;
@@ -65,7 +71,18 @@ public class DefaultRestClient implements RestClient {
} catch (KeyStoreException e) {
throw new RestClientException(e);
}
- this.httpClient = HttpClients.custom().setSSLSocketFactory(sslsf).build();
+ CloseableHttpClient closableHttpClient = HttpClients.custom().setSSLSocketFactory(sslsf).setConnectionManager(getHttpConnectionManager()).build();
+ this.httpClient = closableHttpClient;
+ }
+
+ private HttpClientConnectionManager getHttpConnectionManager(){
+ PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+ // TODO: Introduce configurable variable for Max total and max per router variables.
+ cm.setMaxTotal(MAX_TOTAL_CONNECTIONS);
+ cm.setDefaultMaxPerRoute(DEFAULT_MAX_PER_ROUTE);
+ //HttpHost localhost = new HttpHost("locahost", 80);
+ //cm.setMaxPerRoute(new HttpRoute(localhost), 50);
+ return cm;
}
public HttpResponse doPost(String resourcePath, Object payload) throws RestClientException {
[2/2] git commit: Merge branch '4.0.0-grouping' of
https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Posted by ud...@apache.org.
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1e7c6006
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1e7c6006
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1e7c6006
Branch: refs/heads/4.0.0-grouping
Commit: 1e7c6006f366634d341ac237c5c71ce6da49bf57
Parents: c3105c8 02bb386
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Oct 8 15:34:24 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Oct 8 15:34:24 2014 +0530
----------------------------------------------------------------------
.../grouping/dependency/DependencyBuilder.java | 11 +-
.../dependency/context/ApplicationContext.java | 15 +
.../AutoscalerHealthStatEventReceiver.java | 18 +-
.../AutoscalerTopologyEventReceiver.java | 155 ++-
.../monitor/AbstractClusterMonitor.java | 51 +-
.../autoscaler/monitor/EventHandler.java | 33 +
.../stratos/autoscaler/monitor/Monitor.java | 137 +-
.../monitor/MonitorStatusEventBuilder.java | 55 +
.../monitor/application/ApplicationMonitor.java | 104 +-
.../monitor/cluster/ClusterMonitor.java | 51 +-
.../events/ApplicationActivatedEvent.java | 42 -
.../monitor/events/ApplicationStatusEvent.java | 36 +
.../monitor/events/ClusterActivatedEvent.java | 54 -
.../events/ClusterInMaintenanceEvent.java | 25 -
.../monitor/events/ClusterStatusEvent.java | 36 +
.../monitor/events/GroupActivatedEvent.java | 48 -
.../monitor/events/GroupInMaintenanceEvent.java | 25 -
.../monitor/events/GroupStatusEvent.java | 31 +
.../autoscaler/monitor/events/MonitorEvent.java | 27 -
.../monitor/events/MonitorStatusEvent.java | 27 +-
.../autoscaler/monitor/group/GroupMonitor.java | 74 +-
.../parser/DefaultApplicationParser.java | 45 +-
.../impl/CloudControllerServiceImpl.java | 21 +-
.../cloud/controller/pojo/Dependencies.java | 20 +-
.../pojo/application/DependencyContext.java | 20 +-
.../controller/topology/TopologyBuilder.java | 14 +-
.../topology/TopologyEventPublisher.java | 6 +-
.../LoadBalancerTopologyEventReceiver.java | 77 +-
.../DefaultCompositeApplicationParser.java | 32 +-
.../structure/CompositeAppContext.java | 12 +-
.../application/structure/GroupContext.java | 17 +-
.../definitions/DependencyDefinitions.java | 23 +-
.../deployer/DefaultServiceGroupDeployer.java | 35 +-
.../StratosManagerTopologyEventReceiver.java | 78 +-
.../messaging/domain/topology/Service.java | 9 +-
.../messaging/domain/topology/Topology.java | 11 +-
.../domain/topology/locking/TopologyLock.java | 49 +
.../topology/locking/TopologyLockHierarchy.java | 147 ++
.../event/topology/ApplicationRemovedEvent.java | 15 +-
.../ApplicationActivatedMessageProcessor.java | 52 +-
.../ApplicationCreatedMessageProcessor.java | 75 +-
.../ApplicationRemovedMessageProcessor.java | 103 +-
.../topology/ClusterActivatedProcessor.java | 106 +-
.../ClusterCreatedMessageProcessor.java | 129 +-
.../ClusterMaintenanceModeMessageProcessor.java | 102 +-
.../ClusterRemovedMessageProcessor.java | 105 +-
.../CompleteTopologyMessageProcessor.java | 200 +--
.../topology/GroupActivatedProcessor.java | 68 +-
.../InstanceSpawnedMessageProcessor.java | 150 +-
.../MemberActivatedMessageProcessor.java | 183 +--
.../MemberMaintenanceModeProcessor.java | 159 ++-
.../MemberReadyToShutdownMessageProcessor.java | 160 ++-
.../topology/MemberStartedMessageProcessor.java | 157 ++-
.../MemberSuspendedMessageProcessor.java | 155 ++-
.../MemberTerminatedMessageProcessor.java | 139 +-
.../ServiceCreatedMessageProcessor.java | 74 +-
.../ServiceRemovedMessageProcessor.java | 71 +-
.../topology/TopologyMessageProcessorChain.java | 10 +-
.../topology/TopologyEventMessageDelegator.java | 10 +-
.../receiver/topology/TopologyManager.java | 451 +++++-
.../topology/locking/TopologyLockingTest.java | 209 +++
.../bean/util/converter/PojoConverter.java | 21 +-
.../webapp/stratos/WEB-INF/schemas/schema.xsd | 11 +-
.../main/resources/CloudControllerService.wsdl | 1298 +++++++++---------
64 files changed, 3627 insertions(+), 2257 deletions(-)
----------------------------------------------------------------------