From 78e9a3b6b861ce279caec5cc91cd603e6e36f034 Mon Sep 17 00:00:00 2001 From: Syed Ahmed Date: Fri, 9 Aug 2024 16:36:08 -0400 Subject: [PATCH] nginx: revert #3098 (PROJQUAY-7573) (#3129) reverting this change because we won't use keepalive with gunicorn workers --- conf/init/nginx_conf_create.py | 2 -- conf/nginx/server-base.conf.jnj | 2 -- config.py | 2 -- util/config/schema.py | 5 ----- 4 files changed, 11 deletions(-) diff --git a/conf/init/nginx_conf_create.py b/conf/init/nginx_conf_create.py index 01f4808794..cdd89aa3e1 100644 --- a/conf/init/nginx_conf_create.py +++ b/conf/init/nginx_conf_create.py @@ -102,7 +102,6 @@ def generate_server_config(config): signing_enabled = config.get("FEATURE_SIGNING", False) maximum_layer_size = config.get("MAXIMUM_LAYER_SIZE", "20G") enable_rate_limits = config.get("FEATURE_RATE_LIMITS", False) - manifests_endpoint_keepalive_timeout = config.get("MANIFESTS_ENDPOINT_KEEPALIVE_TIMEOUT", "0") manifests_endpoint_read_timeout = config.get("MANIFESTS_ENDPOINT_READ_TIMEOUT", None) write_config( @@ -113,7 +112,6 @@ def generate_server_config(config): maximum_layer_size=maximum_layer_size, enable_rate_limits=enable_rate_limits, static_dir=STATIC_DIR, - manifests_endpoint_keepalive_timeout=manifests_endpoint_keepalive_timeout, manifests_endpoint_read_timeout=manifests_endpoint_read_timeout, ) diff --git a/conf/nginx/server-base.conf.jnj b/conf/nginx/server-base.conf.jnj index a9de9d53c4..106f015e8e 100644 --- a/conf/nginx/server-base.conf.jnj +++ b/conf/nginx/server-base.conf.jnj @@ -248,8 +248,6 @@ location ~ /v2/([^/]+)\/[^/]+/manifests/ { limit_req zone=namespaced_dynamicauth_light_http2 burst=50 nodelay; {% endif %} - keepalive_timeout {{ manifests_endpoint_keepalive_timeout }}; # Disables HTTP 1.1 keep-alive and forces round-robin. - {% if manifests_endpoint_read_timeout %} proxy_read_timeout {{ manifests_endpoint_read_timeout }}; {% endif %} diff --git a/config.py b/config.py index cef126944e..a68e72f52c 100644 --- a/config.py +++ b/config.py @@ -901,5 +901,3 @@ def create_transaction(db): # Disable pushes while allowing other registry operations. # Defaults to "False". DISABLE_PUSHES = False - - MANIFESTS_ENDPOINT_KEEPALIVE_TIMEOUT = "0" diff --git a/util/config/schema.py b/util/config/schema.py index f2d569c679..a34067c2f4 100644 --- a/util/config/schema.py +++ b/util/config/schema.py @@ -1568,11 +1568,6 @@ "description": "Only disables pushes of new content to the registry, while retaining all other functionality. Differs from read only mode because database is not set as read-only.", "x-example": False, }, - "MANIFESTS_ENDPOINT_KEEPALIVE_TIMEOUT": { - "type": "string", - "description": "Nginx keep alive timeout for manifests endpoints used by pulls and pushes", - "x-example": "2s", - }, "MANIFESTS_ENDPOINT_READ_TIMEOUT": { "type": "string", "description": "Nginx read timeout for manifests endpoints used by pulls and pushes",