opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' 

* stable-2.15:
  Update revision of commit-message-length-plugin
  Improve warning when starting Gerrit JVM without OOM protection
  EventUtil: Improve event bus error logging
  Warning when starting Gerrit JVM without OOM protection
  cmd-index.txt: Fix anchors
  Update revision of commit-message-length-validator plugin

Change-Id: Ia7ffc5961ff5c445f44c35ef1cd88ccdb2af8ab6
This commit is contained in:
David Pursehouse 2018-08-30 13:23:44 +09:00
parent c7c92466f6 60325b70b2
commit 546d1a3160
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/com/google/gerrit/server/extensions/events/EventUtil.java
View File

@ -121,8 +121,11 @@ public class EventUtil {
public void logEventListenerError(Object event, Object listener, Exception error) {
logger.atWarning().log(
"Error in event listener %s for event %s: %s",
listener.getClass().getName(), event.getClass().getName(), error.getMessage());
"Error in event listener %s for event %s: %s - %s",
listener.getClass().getName(),
event.getClass().getName(),
error.getClass().getName(),
error.getMessage());
logger.atFine().withCause(error).log(
"Cause of error in event listener %s:", listener.getClass().getName());
}

5
resources/com/google/gerrit/pgm/init/gerrit.sh
View File

@ -443,6 +443,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 " This may be caused by ${0} not being 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"