commit efed7d068d8dd18acacf5aad0852f42150f1ed33
author Edwin Kempin <ekempin@google.com> Tue Jan 02 15:07:12 2024 +0000
committer Edwin Kempin <ekempin@google.com> Tue Jan 02 15:07:12 2024 +0000
tree 8b4572fe98bcf77b9c223a92efa59768bdb1a56c
parent 4f04d2e3dbfd33129cdc17681c09bdd2c7cdc305

BaseCommitUtil: Add debug logs for opening repo and flushing inserter

It seems auto merges are created twice, once for computing the base
commit during the diff computation and once when creating the change /
patch set. This adds debug logs for the first auto merge creation to get
more insights on this.

Bug: Google b/307063909
Release-Notes: skip
Change-Id: I950ca7b457d1b8a3fe0a51e204d12fffd5e5d2aa
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/server/patch/BaseCommitUtil.java

diff --git a/java/com/google/gerrit/server/patch/BaseCommitUtil.java b/java/com/google/gerrit/server/patch/BaseCommitUtil.java
index a264793..468f6f7 100644
--- a/java/com/google/gerrit/server/patch/BaseCommitUtil.java
+++ b/java/com/google/gerrit/server/patch/BaseCommitUtil.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.server.patch;
 
+import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.entities.Project;
 import com.google.gerrit.entities.RefNames;
@@ -36,6 +37,8 @@
 /** A utility class for computing the base commit / parent for a specific patchset commit. */
 @Singleton
 class BaseCommitUtil {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
   private final AutoMerger autoMerger;
   private final GitRepositoryManager repoManager;
 
@@ -56,6 +59,9 @@
         ObjectInserter ins = newInserter(repo);
         ObjectReader reader = ins.newReader();
         RevWalk rw = new RevWalk(reader)) {
+      logger.atFine().log(
+          "Opened repo %s to compute base commit for %s (inserter: %s)",
+          project, newCommit.name(), ins);
       return getParentCommit(repo, ins, rw, parentNum, newCommit);
     }
   }
@@ -140,6 +146,7 @@
     }
     ObjectId autoMergeId =
         autoMerger.createAutoMergeCommit(new RepoView(repo, rw, ins), rw, ins, mergeCommit);
+    logger.atFine().log("flushing inserter %s", ins);
     ins.flush();
     return rw.parseCommit(autoMergeId);
   }