[arvados] created: 2.6.0-124-g56d337dd2

[git repository hosting]

        at  56d337dd2fdd957e323640bf78c6b95e851951e5 (commit)


commit 56d337dd2fdd957e323640bf78c6b95e851951e5
Author: Tom Clegg <tom at curii.com>
Date:   Fri May 5 10:21:38 2023 -0400

    Enable upstream keepalive in nginx test config.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index 1716291fe..6cc17bb5b 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -24,6 +24,7 @@ http {
   }
   upstream controller {
     server {{UPSTREAMHOST}}:{{CONTROLLERPORT}};
+    keepalive 2;
   }
   server {
     listen {{LISTENHOST}}:{{CONTROLLERSSLPORT}} ssl;
@@ -48,6 +49,7 @@ http {
   }
   upstream arv-git-http {
     server {{UPSTREAMHOST}}:{{GITPORT}};
+    keepalive 2;
   }
   server {
     listen {{LISTENHOST}}:{{GITSSLPORT}} ssl;
@@ -56,14 +58,17 @@ http {
     ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://arv-git-http;
+      proxy_set_header Connection "";
       proxy_set_header Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
       proxy_redirect off;
+      proxy_http_version 1.1;
     }
   }
   upstream keepproxy {
     server {{UPSTREAMHOST}}:{{KEEPPROXYPORT}};
+    keepalive 2;
   }
   server {
     listen {{LISTENHOST}}:{{KEEPPROXYSSLPORT}} ssl;
@@ -72,6 +77,7 @@ http {
     ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://keepproxy;
+      proxy_set_header Connection "";
       proxy_set_header Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
@@ -84,6 +90,7 @@ http {
   }
   upstream keep-web {
     server {{UPSTREAMHOST}}:{{KEEPWEBPORT}};
+    keepalive 2;
   }
   server {
     listen {{LISTENHOST}}:{{KEEPWEBSSLPORT}} ssl;
@@ -92,6 +99,7 @@ http {
     ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://keep-web;
+      proxy_set_header Connection "";
       proxy_set_header Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
@@ -102,44 +110,48 @@ http {
       proxy_request_buffering off;
     }
   }
-  upstream health {
-    server {{UPSTREAMHOST}}:{{HEALTHPORT}};
-  }
   server {
-    listen {{LISTENHOST}}:{{HEALTHSSLPORT}} ssl;
-    server_name health health.*;
+    listen {{LISTENHOST}}:{{KEEPWEBDLSSLPORT}} ssl;
+    server_name keep-web-dl download.* ~.*;
     ssl_certificate "{{SSLCERT}}";
     ssl_certificate_key "{{SSLKEY}}";
     location  / {
-      proxy_pass http://health;
+      proxy_pass http://keep-web;
+      proxy_set_header Connection "";
       proxy_set_header Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
       proxy_redirect off;
 
+      client_max_body_size 0;
       proxy_http_version 1.1;
       proxy_request_buffering off;
     }
   }
+  upstream health {
+    server {{UPSTREAMHOST}}:{{HEALTHPORT}};
+    keepalive 2;
+  }
   server {
-    listen {{LISTENHOST}}:{{KEEPWEBDLSSLPORT}} ssl;
-    server_name keep-web-dl download.* ~.*;
+    listen {{LISTENHOST}}:{{HEALTHSSLPORT}} ssl;
+    server_name health health.*;
     ssl_certificate "{{SSLCERT}}";
     ssl_certificate_key "{{SSLKEY}}";
     location  / {
-      proxy_pass http://keep-web;
+      proxy_pass http://health;
+      proxy_set_header Connection "";
       proxy_set_header Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
       proxy_redirect off;
 
-      client_max_body_size 0;
       proxy_http_version 1.1;
       proxy_request_buffering off;
     }
   }
   upstream ws {
     server {{UPSTREAMHOST}}:{{WSPORT}};
+    keepalive 2;
   }
   server {
     listen {{LISTENHOST}}:{{WSSSLPORT}} ssl;
@@ -162,6 +174,7 @@ http {
   }
   upstream workbench1 {
     server {{UPSTREAMHOST}}:{{WORKBENCH1PORT}};
+    keepalive 2;
   }
   server {
     listen {{LISTENHOST}}:{{WORKBENCH1SSLPORT}} ssl;
@@ -170,14 +183,17 @@ http {
     ssl_certificate_key "{{SSLKEY}}";
     location  / {
       proxy_pass http://workbench1;
+      proxy_set_header Connection "";
       proxy_set_header Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
+      proxy_http_version 1.1;
       proxy_redirect off;
     }
   }
   upstream workbench2 {
     server {{UPSTREAMHOST}}:{{WORKBENCH2PORT}};
+    keepalive 2;
   }
   server {
     listen {{LISTENHOST}}:{{WORKBENCH2SSLPORT}} ssl;
@@ -186,9 +202,11 @@ http {
     ssl_certificate_key "{{SSLKEY}}";
     location / {
       proxy_pass http://workbench2;
+      proxy_set_header Connection "";
       proxy_set_header Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
+      proxy_http_version 1.1;
       proxy_redirect off;
     }
   }

-----------------------------------------------------------------------


hooks/post-receive
--