From 70494519e34c31841704c9db671304ee4557aef6 Mon Sep 17 00:00:00 2001 From: sharmaharisam <54685523+sharmaharisam@users.noreply.github.com> Date: Thu, 5 Dec 2024 13:11:01 +0530 Subject: [PATCH 1/3] Update default_api_stub.py --- .../appengine/runtime/default_api_stub.py | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/google/appengine/runtime/default_api_stub.py b/src/google/appengine/runtime/default_api_stub.py index 9d3489a..3d66c7f 100755 --- a/src/google/appengine/runtime/default_api_stub.py +++ b/src/google/appengine/runtime/default_api_stub.py @@ -41,7 +41,7 @@ -logging.getLogger('requests_nologs').setLevel(logging.ERROR) +# logging.getLogger('requests_nologs').setLevel(logging.ERROR) TICKET_HEADER = 'HTTP_X_APPENGINE_API_TICKET' DEV_TICKET_HEADER = 'HTTP_X_APPENGINE_DEV_REQUEST_ID' @@ -68,7 +68,34 @@ URLLIB3_POOL_COUNT = 10 -URLLIB3_POOL_SIZE = 10 +POOL_SIZE_LOWER_LIMIT = 10 +POOL_SIZE_UPPER_LIMIT = 100 +POOL_SIZE_DEFAULT_VALUE = 10 + +env_pool_size = os.environ.get('POOL_SIZE_URLLIB3') + +if env_pool_size is not None: + try: + URLLIB3_POOL_SIZE = int(env_pool_size) + logging.info( + f'Setting user-provided urllib3 pool size of {URLLIB3_POOL_SIZE}' + ) + except ValueError: + logging.warning( + f'Invalid value for POOL_SIZE_URLLIB3: {env_pool_size}. ' + f'Defaulting to {POOL_SIZE_DEFAULT_VALUE}.' + ) + URLLIB3_POOL_SIZE = POOL_SIZE_DEFAULT_VALUE +else: + URLLIB3_POOL_SIZE = POOL_SIZE_DEFAULT_VALUE + +if not (POOL_SIZE_LOWER_LIMIT <= URLLIB3_POOL_SIZE <= POOL_SIZE_UPPER_LIMIT): + logging.warning( + f'URLLIB3_POOL_SIZE ({URLLIB3_POOL_SIZE}) is out of range' + f' [{POOL_SIZE_LOWER_LIMIT}, {POOL_SIZE_UPPER_LIMIT}]. Defaulting to' + f' {POOL_SIZE_DEFAULT_VALUE}.' + ) + URLLIB3_POOL_SIZE = POOL_SIZE_DEFAULT_VALUE From f869b9a7ef3ee47239d028a16ff8b47794f9846e Mon Sep 17 00:00:00 2001 From: sharmaharisam <54685523+sharmaharisam@users.noreply.github.com> Date: Thu, 5 Dec 2024 13:19:40 +0530 Subject: [PATCH 2/3] Update default_api_stub.py --- src/google/appengine/runtime/default_api_stub.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/appengine/runtime/default_api_stub.py b/src/google/appengine/runtime/default_api_stub.py index 3d66c7f..f560eba 100755 --- a/src/google/appengine/runtime/default_api_stub.py +++ b/src/google/appengine/runtime/default_api_stub.py @@ -41,7 +41,7 @@ -# logging.getLogger('requests_nologs').setLevel(logging.ERROR) +logging.getLogger('requests_nologs').setLevel(logging.ERROR) TICKET_HEADER = 'HTTP_X_APPENGINE_API_TICKET' DEV_TICKET_HEADER = 'HTTP_X_APPENGINE_DEV_REQUEST_ID' From 9311bc0f97f8c1637099888aed7af5dcfc62fe41 Mon Sep 17 00:00:00 2001 From: sharmaharisam <54685523+sharmaharisam@users.noreply.github.com> Date: Thu, 5 Dec 2024 13:36:05 +0530 Subject: [PATCH 3/3] Update default_api_stub.py --- .../appengine/runtime/default_api_stub.py | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/google/appengine/runtime/default_api_stub.py b/src/google/appengine/runtime/default_api_stub.py index f560eba..d26399c 100755 --- a/src/google/appengine/runtime/default_api_stub.py +++ b/src/google/appengine/runtime/default_api_stub.py @@ -72,29 +72,11 @@ POOL_SIZE_UPPER_LIMIT = 100 POOL_SIZE_DEFAULT_VALUE = 10 -env_pool_size = os.environ.get('POOL_SIZE_URLLIB3') - -if env_pool_size is not None: - try: - URLLIB3_POOL_SIZE = int(env_pool_size) - logging.info( - f'Setting user-provided urllib3 pool size of {URLLIB3_POOL_SIZE}' - ) - except ValueError: - logging.warning( - f'Invalid value for POOL_SIZE_URLLIB3: {env_pool_size}. ' - f'Defaulting to {POOL_SIZE_DEFAULT_VALUE}.' - ) - URLLIB3_POOL_SIZE = POOL_SIZE_DEFAULT_VALUE -else: - URLLIB3_POOL_SIZE = POOL_SIZE_DEFAULT_VALUE +URLLIB3_POOL_SIZE = int( + os.environ.get('POOL_SIZE_URLLIB3', POOL_SIZE_DEFAULT_VALUE) +) if not (POOL_SIZE_LOWER_LIMIT <= URLLIB3_POOL_SIZE <= POOL_SIZE_UPPER_LIMIT): - logging.warning( - f'URLLIB3_POOL_SIZE ({URLLIB3_POOL_SIZE}) is out of range' - f' [{POOL_SIZE_LOWER_LIMIT}, {POOL_SIZE_UPPER_LIMIT}]. Defaulting to' - f' {POOL_SIZE_DEFAULT_VALUE}.' - ) URLLIB3_POOL_SIZE = POOL_SIZE_DEFAULT_VALUE