Revert "Set h2.maxCompactTime to 15 seconds"

This reverts commit 5b5f94d764.

Since switching to Noble and Podman using sigint to gracefully request
Gerrit shutdown we've run into shutdowns that hit our 5 minute timeout
causing podman to issue a sigkill which does stop gerrit. In manual
testing in April and in our CI jobs sigint typically works for shutting
down Gerrit in a reasonable amount of time just like sighup did before
moving to podman. This makes me wonder if there are other shutdown tasks
that are simply taking longer than the time allotted.

One such shutdown task is the h2 compaction which we set to a 15000ms
timeout in the reverted change. There are 17 h2 cache DBs which comes
out to a max of 255 seconds if performed serially. This is less than 300
seconds but close enough that if there are other shutdown tasks taht
need at least 45 seconds we could be hitting the podman shutdown
timeout.

Since we're typically deleting these large cache files on disk anyway as
part of the gerrit restart process lets go ahead and pull this
configuration out of our gerrit install. It is redundant and may be
contributing to slow shutdowns.

Change-Id: I7d4a09251f7e86b26a4a5cf7aa1081ede58aa5ab
This commit is contained in:
Clark Boylan
2025-05-21 11:19:02 -07:00
parent a3a6475b64
commit 5728811e1f
2 changed files with 0 additions and 2 deletions

View File

@@ -33,7 +33,6 @@ services:
environment:
JAVA_OPTIONS: >-
-Dlog4j2.formatMsgNoLookups=true
-Dh2.maxCompactTime=15000
{% if gerrit_heap_limit is defined %}
-Xmx{{ gerrit_heap_limit }}
{% endif %}

View File

@@ -42,7 +42,6 @@
javaHome = /usr/lib/jvm/java-17-openjdk-amd64
javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"
javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance"
javaOptions = -Dh2.maxCompactTime=15000
[log]
rotate = true
compress = true