Compilation results for gerrit2003.wikimedia.org: System changes detected

Catalog differences

Summary

Resources modified

• File[/var/lib/gerrit/review_site/etc/gerrit.config]

  Content differences:

  --- /var/lib/gerrit/review_site/etc/gerrit.config.orig
  +++ /var/lib/gerrit/review_site/etc/gerrit.config
  @@ -133,12 +133,12 @@
       minThreads = 10
       maxThreads = 60
       maxWait = 2 min
  -    # Set the default explicitly. We require this to be longer than Apache 2
  -    # mod_proxy ProxyTimeout. See modules/profile/templates/gerrit/apache.erb
  -    # where it is set to a lower value.
  +    # Set this explicitly. We require this to be longer than Apache 2
  +    # mod_proxy timeouts. See modules/profile/templates/gerrit/apache.erb
  +    # where they are set to lower values.
       #
       # Ref: https://phabricator.wikimedia.org/T246763#11637703
  -    idleTimeout = 30 sec
  +    idleTimeout = 60 sec
   [index]
       type = LUCENE
   # User gerritbot

• File[/etc/apache2/sites-available/50-gerrit-wikimedia-org.conf]

  Content differences:

  --- /etc/apache2/sites-available/50-gerrit-wikimedia-org.conf.orig
  +++ /etc/apache2/sites-available/50-gerrit-wikimedia-org.conf
  @@ -118,7 +118,8 @@
   
       # mod_proxy requires a shorter timeout than Gerrit's Jetty
       #
  -    # Because Gerrit's Jetty has a 30s timeout (httpd.idleTimeout = 30s):
  +    # Because Gerrit's Jetty timeout is kept longer than Apache's mod_proxy
  +    # timeouts:
       #
       # - by the tiny short time it takes for mod_proxy to send the packet to
       #   Jetty, the connection might have reached its timeout on the Jetty side
  @@ -135,11 +136,11 @@
       # MUST be shorter than Gerrit `httpd.idleTimeout`
       ProxyTimeout 25
   
  -    # Worker for Gitiles
  -    ProxyPass /g/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On
  +    # Worker for Gitiles. 
  +    ProxyPass /g/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On timeout=55 # T421904
       # Below requests are handled by the same backend since the URLs match and
       # thus with the same settings.
  -    ProxyPass /r/plugins/gitiles/ http://127.0.0.1:8080/r/plugins/gitiles/
  +    ProxyPass /r/plugins/gitiles/ http://127.0.0.1:8080/r/plugins/gitiles/ retry=0 nocanon Keepalive=On timeout=55 # T421904
   
       # Worker for Gerrit
       ProxyPass /r/ http://127.0.0.1:8080/r/ retry=0 nocanon Keepalive=On

Relevant files

• Production catalog
• Change catalog
• Production errors/warnings
• Change errors/warnings
• Standard Diff
• Full Diff