opendev/gerrit
Code Issues Proposed changes

Improve reindex progress monitoring

Browse Source 
Use stderr instead of stdout for progress monitoring.  This
allows us to later output debug info to stdout which can then
easily be redirected to a file.  Also count the changes and
use this count in the progress monitors.

Change-Id: Iaf838def308c3a9df0bb62373ab798659334a59b
This commit is contained in:
Martin Fick
2013-06-26 20:20:39 -06:00
parent 889126bc46
commit b4ae77bdb1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
View File

@@ -222,12 +222,14 @@ public class Reindex extends SiteProgram {
ListeningScheduledExecutorService executor = sysInjector.getInstance(
Key.get(ListeningScheduledExecutorService.class, IndexExecutor.class));
ProgressMonitor pm = new TextProgressMonitor(new PrintWriter(System.out));
ProgressMonitor pm = new TextProgressMonitor();
pm.start(1);
pm.beginTask("Collecting projects", ProgressMonitor.UNKNOWN);
Set<Project.NameKey> projects = Sets.newTreeSet();
int changeCount = 0;
try {
for (Change change : db.changes().all()) {
changeCount++;
if (projects.add(change.getProject())) {
pm.update(1);
}
@@ -238,9 +240,9 @@ public class Reindex extends SiteProgram {
pm.endTask();
final MultiProgressMonitor mpm =
new MultiProgressMonitor(System.out, "Reindexing changes");
new MultiProgressMonitor(System.err, "Reindexing changes");
final Task projTask = mpm.beginSubTask("projects", projects.size());
final Task doneTask = mpm.beginSubTask(null, MultiProgressMonitor.UNKNOWN);
final Task doneTask = mpm.beginSubTask(null, changeCount);
final Task failedTask = mpm.beginSubTask("failed", MultiProgressMonitor.UNKNOWN);
Stopwatch sw = new Stopwatch().start();