{"host": "gerrit2003.wikimedia.org", "state": "core_diff", "description": "Differences to core resources", "diff": {"full": {"total": 3432, "only_in_self": [], "only_in_other": [], "resource_diffs": [{"resource": "File[/var/lib/gerrit/review_site/etc/gerrit.config]", "content": "--- /var/lib/gerrit/review_site/etc/gerrit.config.orig\n+++ /var/lib/gerrit/review_site/etc/gerrit.config\n@@ -133,12 +133,12 @@\n     minThreads = 10\n     maxThreads = 60\n     maxWait = 2 min\n-    # Set the default explicitly. We require this to be longer than Apache 2\n-    # mod_proxy ProxyTimeout. See modules/profile/templates/gerrit/apache.erb\n-    # where it is set to a lower value.\n+    # Set this explicitly. We require this to be longer than Apache 2\n+    # mod_proxy timeouts. See modules/profile/templates/gerrit/apache.erb\n+    # where they are set to lower values.\n     #\n     # Ref: https://phabricator.wikimedia.org/T246763#11637703\n-    idleTimeout = 30 sec\n+    idleTimeout = 60 sec\n [index]\n     type = LUCENE\n # User gerritbot"}, {"resource": "Httpd::Site[gerrit.wikimedia.org]"}, {"resource": "Httpd::Conf[gerrit.wikimedia.org]"}, {"resource": "File[/etc/apache2/sites-available/50-gerrit-wikimedia-org.conf]", "content": "--- /etc/apache2/sites-available/50-gerrit-wikimedia-org.conf.orig\n+++ /etc/apache2/sites-available/50-gerrit-wikimedia-org.conf\n@@ -118,7 +118,8 @@\n \n     # mod_proxy requires a shorter timeout than Gerrit's Jetty\n     #\n-    # Because Gerrit's Jetty has a 30s timeout (httpd.idleTimeout = 30s):\n+    # Because Gerrit's Jetty timeout is kept longer than Apache's mod_proxy\n+    # timeouts:\n     #\n     # - by the tiny short time it takes for mod_proxy to send the packet to\n     #   Jetty, the connection might have reached its timeout on the Jetty side\n@@ -135,11 +136,11 @@\n     # MUST be shorter than Gerrit `httpd.idleTimeout`\n     ProxyTimeout 25\n \n-    # Worker for Gitiles\n-    ProxyPass /g/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On\n+    # Worker for Gitiles. \n+    ProxyPass /g/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On timeout=55 #\u00c2\u00a0T421904\n     # Below requests are handled by the same backend since the URLs match and\n     # thus with the same settings.\n-    ProxyPass /r/plugins/gitiles/ http://127.0.0.1:8080/r/plugins/gitiles/\n+    ProxyPass /r/plugins/gitiles/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On timeout=55 #\u00c2\u00a0T421904\n \n     # Worker for Gerrit\n     ProxyPass /r/ http://127.0.0.1:8080/r/ retry=0 nocanon Keepalive=On"}], "perc_changed": "0.12%"}, "core": {"total": 3432, "only_in_self": [], "only_in_other": [], "resource_diffs": [{"resource": "File[/var/lib/gerrit/review_site/etc/gerrit.config]", "content": "--- /var/lib/gerrit/review_site/etc/gerrit.config.orig\n+++ /var/lib/gerrit/review_site/etc/gerrit.config\n@@ -133,12 +133,12 @@\n     minThreads = 10\n     maxThreads = 60\n     maxWait = 2 min\n-    # Set the default explicitly. We require this to be longer than Apache 2\n-    # mod_proxy ProxyTimeout. See modules/profile/templates/gerrit/apache.erb\n-    # where it is set to a lower value.\n+    # Set this explicitly. We require this to be longer than Apache 2\n+    # mod_proxy timeouts. See modules/profile/templates/gerrit/apache.erb\n+    # where they are set to lower values.\n     #\n     # Ref: https://phabricator.wikimedia.org/T246763#11637703\n-    idleTimeout = 30 sec\n+    idleTimeout = 60 sec\n [index]\n     type = LUCENE\n # User gerritbot"}, {"resource": "File[/etc/apache2/sites-available/50-gerrit-wikimedia-org.conf]", "content": "--- /etc/apache2/sites-available/50-gerrit-wikimedia-org.conf.orig\n+++ /etc/apache2/sites-available/50-gerrit-wikimedia-org.conf\n@@ -118,7 +118,8 @@\n \n     # mod_proxy requires a shorter timeout than Gerrit's Jetty\n     #\n-    # Because Gerrit's Jetty has a 30s timeout (httpd.idleTimeout = 30s):\n+    # Because Gerrit's Jetty timeout is kept longer than Apache's mod_proxy\n+    # timeouts:\n     #\n     # - by the tiny short time it takes for mod_proxy to send the packet to\n     #   Jetty, the connection might have reached its timeout on the Jetty side\n@@ -135,11 +136,11 @@\n     # MUST be shorter than Gerrit `httpd.idleTimeout`\n     ProxyTimeout 25\n \n-    # Worker for Gitiles\n-    ProxyPass /g/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On\n+    # Worker for Gitiles. \n+    ProxyPass /g/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On timeout=55 #\u00c2\u00a0T421904\n     # Below requests are handled by the same backend since the URLs match and\n     # thus with the same settings.\n-    ProxyPass /r/plugins/gitiles/ http://127.0.0.1:8080/r/plugins/gitiles/\n+    ProxyPass /r/plugins/gitiles/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On timeout=55 #\u00c2\u00a0T421904\n \n     # Worker for Gerrit\n     ProxyPass /r/ http://127.0.0.1:8080/r/ retry=0 nocanon Keepalive=On"}], "perc_changed": "0.06%"}, "main": {"total": 3432, "only_in_self": [], "only_in_other": [], "resource_diffs": [{"resource": "Httpd::Conf[gerrit.wikimedia.org]"}, {"resource": "File[/var/lib/gerrit/review_site/etc/gerrit.config]", "content": "--- /var/lib/gerrit/review_site/etc/gerrit.config.orig\n+++ /var/lib/gerrit/review_site/etc/gerrit.config\n@@ -133,12 +133,12 @@\n     minThreads = 10\n     maxThreads = 60\n     maxWait = 2 min\n-    # Set the default explicitly. We require this to be longer than Apache 2\n-    # mod_proxy ProxyTimeout. See modules/profile/templates/gerrit/apache.erb\n-    # where it is set to a lower value.\n+    # Set this explicitly. We require this to be longer than Apache 2\n+    # mod_proxy timeouts. See modules/profile/templates/gerrit/apache.erb\n+    # where they are set to lower values.\n     #\n     # Ref: https://phabricator.wikimedia.org/T246763#11637703\n-    idleTimeout = 30 sec\n+    idleTimeout = 60 sec\n [index]\n     type = LUCENE\n # User gerritbot"}, {"resource": "Httpd::Site[gerrit.wikimedia.org]"}, {"resource": "File[/etc/apache2/sites-available/50-gerrit-wikimedia-org.conf]", "content": "--- /etc/apache2/sites-available/50-gerrit-wikimedia-org.conf.orig\n+++ /etc/apache2/sites-available/50-gerrit-wikimedia-org.conf\n@@ -118,7 +118,8 @@\n \n     # mod_proxy requires a shorter timeout than Gerrit's Jetty\n     #\n-    # Because Gerrit's Jetty has a 30s timeout (httpd.idleTimeout = 30s):\n+    # Because Gerrit's Jetty timeout is kept longer than Apache's mod_proxy\n+    # timeouts:\n     #\n     # - by the tiny short time it takes for mod_proxy to send the packet to\n     #   Jetty, the connection might have reached its timeout on the Jetty side\n@@ -135,11 +136,11 @@\n     # MUST be shorter than Gerrit `httpd.idleTimeout`\n     ProxyTimeout 25\n \n-    # Worker for Gitiles\n-    ProxyPass /g/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On\n+    # Worker for Gitiles. \n+    ProxyPass /g/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On timeout=55 #\u00c2\u00a0T421904\n     # Below requests are handled by the same backend since the URLs match and\n     # thus with the same settings.\n-    ProxyPass /r/plugins/gitiles/ http://127.0.0.1:8080/r/plugins/gitiles/\n+    ProxyPass /r/plugins/gitiles/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On timeout=55 #\u00c2\u00a0T421904\n \n     # Worker for Gerrit\n     ProxyPass /r/ http://127.0.0.1:8080/r/ retry=0 nocanon Keepalive=On"}], "perc_changed": "0.12%"}}}