opendev/gerrit
Code Issues Proposed changes

Merge "Output NoteDb migration progress to Flogger" into stable-2.16

Browse Source
This commit is contained in:
David Pursehouse
2019-08-22 10:49:15 +00:00
committed by Gerrit Code Review
parent 5f78e60775 001694bd21
commit 7b7fe5fe65
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
View File

@@ -109,7 +109,6 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.transport.ReceiveCommand;
import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.io.NullOutputStream;
/** One stop shop for migrating a site's change storage from ReviewDb to NoteDb. */ /** One stop shop for migrating a site's change storage from ReviewDb to NoteDb. */
public class NoteDbMigrator implements AutoCloseable { public class NoteDbMigrator implements AutoCloseable {
@@ -134,6 +133,20 @@ public class NoteDbMigrator implements AutoCloseable {
cfg.setBoolean(SECTION_NOTE_DB, NoteDbTable.CHANGES.key(), TRIAL, trial); cfg.setBoolean(SECTION_NOTE_DB, NoteDbTable.CHANGES.key(), TRIAL, trial);
} }
private static class NoteDbMigrationLoggerOut extends OutputStream {
private StringBuilder outputBuffer = new StringBuilder();
@Override
public synchronized void write(int b) throws IOException {
if (b == '\r' || b == '\n') {
logger.atInfo().log(outputBuffer.toString());
outputBuffer = new StringBuilder();
} else {
outputBuffer.append(b);
}
}
}
public static class Builder { public static class Builder {
private final Config cfg; private final Config cfg;
private final SitePaths sitePaths; private final SitePaths sitePaths;
@@ -156,7 +169,7 @@ public class NoteDbMigrator implements AutoCloseable {
private ImmutableList<Project.NameKey> projects = ImmutableList.of(); private ImmutableList<Project.NameKey> projects = ImmutableList.of();
private ImmutableList<Project.NameKey> skipProjects = ImmutableList.of(); private ImmutableList<Project.NameKey> skipProjects = ImmutableList.of();
private ImmutableList<Change.Id> changes = ImmutableList.of(); private ImmutableList<Change.Id> changes = ImmutableList.of();
private OutputStream progressOut = NullOutputStream.INSTANCE; private OutputStream progressOut = new NoteDbMigrationLoggerOut();
private NotesMigrationState stopAtState; private NotesMigrationState stopAtState;
private boolean trial; private boolean trial;
private boolean forceRebuild; private boolean forceRebuild;