diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2018-08-29 08:40:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-29 08:40:50 +0000 |
| commit | ed711ec885e6a6578b47772003e6d6fd7f2c8343 (patch) | |
| tree | e19b770489f45ee09db2b87482eaa437d9a955dd | |
| parent | 373159da1698f499366380216934d3f78f67218f (diff) | |
| parent | 727a856753e65aba4a4977904ce7500309803df5 (diff) | |
Merge "Warning when starting Gerrit JVM without OOM protection" into stable-2.14
| -rwxr-xr-x | gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh index 78fcc645c7..92c2ffffbe 100755 --- a/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh +++ b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh @@ -439,6 +439,11 @@ case "$ACTION" in echo -16 > "/proc/${PID}/oom_adj" fi fi + elif [ "$(uname -s)"=="Linux" ] && test -d "/proc/${PID}"; then + echo "WARNING: Could not adjust Gerrit's process for the kernel's out-of-memory killer," + echo " one of the possible causes are ${0} not run as root." + echo " Consider changing the OOM score adjustment manually for Gerrit's PID=${PID} with e.g.:" + echo " echo '-1000' | sudo tee /proc/${PID}/oom_score_adj" fi TIMEOUT="$GERRIT_STARTUP_TIMEOUT" |