opendev/gerrit
Code Issues Proposed changes

Merge "ChangeNotes: Catch all exceptions while scanning changes"

Browse Source
This commit is contained in:
Patrick Hiesel
2020-08-27 14:12:54 +00:00
committed by Gerrit Code Review
parent 3e84ba8b19 ae59575df4
commit 571436cf41
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/index/change/AllChangesIndexer.java
View File

@@ -311,7 +311,7 @@ public class AllChangesIndexer extends SiteIndexer<Change.Id, ChangeData, Change
}
}
private void fail(String error, boolean failed, Exception e) {
private void fail(String error, boolean failed, Throwable e) {
if (failed) {
this.failed.update(1);
}

7
java/com/google/gerrit/server/notedb/ChangeNotes.java
View File

@@ -51,7 +51,6 @@ import com.google.gerrit.entities.Project;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.entities.RobotComment;
import com.google.gerrit.entities.SubmitRecord;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.AssigneeStatusUpdate;
import com.google.gerrit.server.ReviewerByEmailSet;
import com.google.gerrit.server.ReviewerSet;
@@ -248,7 +247,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
ChangeNotes n = new ChangeNotes(args, rawChangeFromNoteDb, true, null);
try {
n.load();
} catch (StorageException e) {
} catch (Exception e) {
return ChangeNotesResult.error(n.getChangeId(), e);
}
return ChangeNotesResult.notes(n);
@@ -257,7 +256,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
/** Result of {@link #scan(Repository,Project.NameKey)}. */
@AutoValue
public abstract static class ChangeNotesResult {
static ChangeNotesResult error(Change.Id id, StorageException e) {
static ChangeNotesResult error(Change.Id id, Throwable e) {
return new AutoValue_ChangeNotes_Factory_ChangeNotesResult(id, Optional.of(e), null);
}
@@ -270,7 +269,7 @@ public class ChangeNotes extends AbstractChangeNotes<ChangeNotes> {
public abstract Change.Id id();
/** Error encountered while loading this change, if any. */
public abstract Optional<StorageException> error();
public abstract Optional<Throwable> error();
/**
* Notes loaded for this change.