commit 57128499260be933741f61cd017c48ca44464e10
author Edwin Kempin <ekempin@google.com> Fri Oct 18 14:36:46 2019 +0200
committer Edwin Kempin <ekempin@google.com> Fri Oct 18 14:41:25 2019 +0200
tree 9ba1f5a56ca7a5bdab2fa2a8656a5117e4a65ed1
parent 3e9cc1af5033c958bf755098c2adc53618aad7f9

MergeOp: Log IntegrationExceptions that are treated as conflict only as warning

We convert IntegrationExceptions into ResourceConflictExceptions. This
means for the caller this is a 409 Conflict and not an error. If it's
not an error we should not log it at severe level. For example such an
IntegrateException occurs if a change cannot be submitted because there
is a conflict with the destination branch.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I0ae5186fae346c71bad473092bb554e43c03515e

java/com/google/gerrit/server/submit/MergeOp.java

diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java
index a06027a..406c0a1 100644
--- a/java/com/google/gerrit/server/submit/MergeOp.java
+++ b/java/com/google/gerrit/server/submit/MergeOp.java
@@ -504,7 +504,7 @@
               try {
                 integrateIntoHistory(cs);
               } catch (IntegrationException e) {
-                logger.atSevere().withCause(e).log("Error from integrateIntoHistory");
+                logger.atWarning().withCause(e).log("Error from integrateIntoHistory");
                 throw new ResourceConflictException(e.getMessage(), e);
               }
               return null;