From 541b5bcdd5add5aec1fa77ae2b6ea79fc8ad6e9d Mon Sep 17 00:00:00 2001 From: Alex Shatov Date: Wed, 13 Sep 2017 16:22:17 -0400 Subject: setting the pool-size in requests session * to cache the connections - performance improvement Change-Id: I5a9b3ee30d40dc8d1b8154d5345a00b716e07964 Issue-Id: DCAEGEN2-62 Signed-off-by: Alex Shatov --- policyhandler/deploy_handler.py | 19 ++++++++++++++++++- policyhandler/policy_rest.py | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) (limited to 'policyhandler') diff --git a/policyhandler/deploy_handler.py b/policyhandler/deploy_handler.py index 7d9c513..1d50fc3 100644 --- a/policyhandler/deploy_handler.py +++ b/policyhandler/deploy_handler.py @@ -27,10 +27,14 @@ from .config import Config from .discovery import DiscoveryClient from .onap.audit import REQUEST_X_ECOMP_REQUESTID, Audit, AuditHttpCode +POOL_SIZE = 1 + class DeployHandler(object): """ deploy-handler """ _logger = logging.getLogger("policy_handler.deploy_handler") _lazy_inited = False + + _requests_session = None _config = None _url = None _url_path = None @@ -42,6 +46,17 @@ class DeployHandler(object): if DeployHandler._lazy_inited: return DeployHandler._lazy_inited = True + + DeployHandler._requests_session = requests.Session() + DeployHandler._requests_session.mount( + 'https://', + requests.adapters.HTTPAdapter(pool_connections=POOL_SIZE, pool_maxsize=POOL_SIZE) + ) + DeployHandler._requests_session.mount( + 'http://', + requests.adapters.HTTPAdapter(pool_connections=POOL_SIZE, pool_maxsize=POOL_SIZE) + ) + DeployHandler._target_entity = Config.config["deploy_handler"] DeployHandler._url = DiscoveryClient.get_service_url(DeployHandler._target_entity) DeployHandler._url_path = DeployHandler._url + '/policy' @@ -66,7 +81,9 @@ class DeployHandler(object): res = None try: - res = requests.post(DeployHandler._url_path, json=msg, headers=headers) + res = DeployHandler._requests_session.post( + DeployHandler._url_path, json=msg, headers=headers + ) except requests.exceptions.RequestException as ex: error_msg = "failed to post to deployment-handler {0} {1} msg={2} headers={3}" \ .format(DeployHandler._url_path, str(ex), msg_str, headers_str) diff --git a/policyhandler/policy_rest.py b/policyhandler/policy_rest.py index d49164c..bf8a31d 100644 --- a/policyhandler/policy_rest.py +++ b/policyhandler/policy_rest.py @@ -136,6 +136,8 @@ class PolicyRest(object): """ policy-engine """ _logger = logging.getLogger("policy_handler.policy_rest") _lazy_inited = False + + _requests_session = None _url = None _headers = None _target_entity = None @@ -151,7 +153,20 @@ class PolicyRest(object): if PolicyRest._lazy_inited: return PolicyRest._lazy_inited = True + config = Config.config[Config.FIELD_POLICY_ENGINE] + + pool_size = config.get("pool_connections", 20) + PolicyRest._requests_session = requests.Session() + PolicyRest._requests_session.mount( + 'https://', + requests.adapters.HTTPAdapter(pool_connections=pool_size, pool_maxsize=pool_size) + ) + PolicyRest._requests_session.mount( + 'http://', + requests.adapters.HTTPAdapter(pool_connections=pool_size, pool_maxsize=pool_size) + ) + PolicyRest._url = config["url"] + config["path_api"] PolicyRest._headers = config["headers"] PolicyRest._target_entity = config.get("target_entity", Config.FIELD_POLICY_ENGINE) @@ -186,7 +201,7 @@ class PolicyRest(object): PolicyRest._logger.info(log_line) res = None try: - res = requests.post(full_path, json=json_body, headers=headers) + res = PolicyRest._requests_session.post(full_path, json=json_body, headers=headers) except requests.exceptions.RequestException as ex: error_code = AuditHttpCode.SERVICE_UNAVAILABLE_ERROR.value error_msg = "failed to post to PDP {0} {1} msg={2} headers={3}" \ -- cgit 1.2.3-korg