diff options
author | Edwin Kempin <ekempin@google.com> | 2023-11-14 07:48:22 +0000 |
---|---|---|
committer | Edwin Kempin <ekempin@google.com> | 2023-11-14 08:12:59 +0000 |
commit | b0e94e0eccbd040369662e4b9f81bf157cfed987 (patch) | |
tree | 7f8c62d01b81ae87084375b3e45871e6481a5c6b | |
parent | 30e711650e11840b50851923e97d9315f0c079d8 (diff) |
ChangeJson: Drop logging for when currentRevision is unexpectedly not set
These logs were added to investigate a bug where currentRevision in
ChangeInfo was unexpectedly not set. This bug has been fixed by change
Ic99c96fe9 and hence these logs are no longer needed.
Release-Notes: skip
Bug: Google b/304369791
Change-Id: I0903a6869a9eb463e2a3e126858843f8f0a692f3
Signed-off-by: Edwin Kempin <ekempin@google.com>
-rw-r--r-- | java/com/google/gerrit/server/change/ChangeJson.java | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java index 352f27ee65..beff1a36a6 100644 --- a/java/com/google/gerrit/server/change/ChangeJson.java +++ b/java/com/google/gerrit/server/change/ChangeJson.java @@ -106,7 +106,6 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.TrackingFooters; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.index.change.ChangeField; -import com.google.gerrit.server.logging.CallerFinder; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.ReviewerStateInternal; import com.google.gerrit.server.patch.PatchListNotAvailableException; @@ -768,26 +767,6 @@ public class ChangeJson { break; } } - if (limitToPsId.isEmpty() && out.currentRevision == null) { - logger.atSevere().log( - "current revision for change %s not found" - + " (current patch set ID = %s, patch sets = %s, meta revision = %s," - + " options = %s, caller = %s)", - cd.getId(), - cd.change().currentPatchSetId(), - src.entrySet().stream() - .collect(toImmutableMap(Map.Entry::getKey, e -> e.getValue().commitId().name())), - getMetaRevisionIfAvailable(cd).map(ObjectId::name).orElse("n/a"), - options, - CallerFinder.builder().addTarget(ChangeJson.class).build().findCallerLazy()); - PatchSet.Id currentPatchSetFromChangeData = - Optional.ofNullable(cd.currentPatchSet()).map(PatchSet::id).orElse(null); - if (!cd.change().currentPatchSetId().equals(currentPatchSetFromChangeData)) { - logger.atSevere().log( - "mismatch between current patch set in Change (%s) and ChangeData (%s)", - cd.change().currentPatchSetId(), currentPatchSetFromChangeData); - } - } } if (has(CURRENT_ACTIONS) || has(CHANGE_ACTIONS)) { @@ -805,14 +784,6 @@ public class ChangeJson { return out; } - private Optional<ObjectId> getMetaRevisionIfAvailable(ChangeData cd) { - try { - return Optional.of(cd.metaRevisionOrThrow()); - } catch (Exception e) { - return Optional.empty(); - } - } - private Map<ReviewerState, Collection<AccountInfo>> reviewerMap( ReviewerSet reviewers, ReviewerByEmailSet reviewersByEmail, boolean includeRemoved) { Map<ReviewerState, Collection<AccountInfo>> reviewerMap = new HashMap<>(); |