diff options
| author | Daniele Sassoli <danielesassoli@gmail.com> | 2024-01-12 16:44:23 -0800 |
|---|---|---|
| committer | Daniele Sassoli <danielesassoli@gmail.com> | 2024-01-12 16:44:32 -0800 |
| commit | 91d3269f7653ead55f306e8ef5419bb512ee7b39 (patch) | |
| tree | 52d1c315585a6b73c75ab254d47c7fe77363bc68 | |
| parent | e2e7d68c093fd790c60b976736a05d8962a6fe98 (diff) | |
| parent | 4635f8e7e150ef0691f76bda184dce897301899c (diff) | |
Merge branch 'stable-3.6' into stable-3.7
* stable-3.6:
Make extra stop timeout configurable
Release-Notes: skip
Change-Id: Id18bd60589c04bf3b1924a6f8efdc3453aa1a50c
| -rw-r--r-- | Documentation/config-gerrit.txt | 7 | ||||
| -rwxr-xr-x | resources/com/google/gerrit/pgm/init/gerrit.sh | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index 72519daf3e..6a252598d9 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -1937,6 +1937,13 @@ The maximum time (in seconds) to wait for a gerrit.sh start command to run a new Gerrit daemon successfully. If not set, defaults to 90 seconds. +[[container.shutdownTimeout]]container.shutdownTimeout:: ++ +The maximum time (in seconds) to wait for a gerrit.sh stop command. +This is added to the highest value between either 'sshd.gracefulStopTimeout' +or 'httpd.gracefulStopTimeout'. If not set, defaults to +30 seconds + [[container.user]]container.user:: + Login name (or UID) of the operating system user the Gerrit JVM diff --git a/resources/com/google/gerrit/pgm/init/gerrit.sh b/resources/com/google/gerrit/pgm/init/gerrit.sh index 1399b15d22..b1f6ade1e8 100755 --- a/resources/com/google/gerrit/pgm/init/gerrit.sh +++ b/resources/com/google/gerrit/pgm/init/gerrit.sh @@ -388,7 +388,7 @@ ulimit -x >/dev/null 2>&1 && ulimit -x unlimited ; # file locks ##################################################### # Configure the maximum wait time for shutdown ##################################################### -EXTRA_STOP_TIMEOUT=30 +EXTRA_STOP_TIMEOUT=$(get_time_unit_sec "$(get_config --get container.shutdownTimeout || echo 30)") HTTPD_STOP_TIMEOUT=$(get_time_unit_sec "$(get_config --get httpd.gracefulStopTimeout || echo 0)") SSHD_STOP_TIMEOUT=$(get_time_unit_sec "$(get_config --get sshd.gracefulStopTimeout || echo 0)") |