opendev/gerrit
Code Issues Proposed changes

Add progress monitor for migrating accounts to NoteDb

Browse Source 
For tens of thousands of accounts, this can take quite a while.

Change-Id: I90de7dbb02cb5011111283e76219058f788d963e
This commit is contained in:
Dave Borowitz
2017-06-29 09:26:43 -04:00
parent 56367dd838
commit e3b4760747
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_154.java
View File

@@ -33,7 +33,9 @@ import java.util.HashSet;
import java.util.Set;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.TextProgressMonitor;
/** Migrate accounts to NoteDb. */
public class Schema_154 extends SchemaVersion {
@@ -57,16 +59,23 @@ public class Schema_154 extends SchemaVersion {
protected void migrateData(ReviewDb db, UpdateUI ui) throws OrmException, SQLException {
try {
try (Repository repo = repoManager.openRepository(allUsersName)) {
for (Account account : scanAccounts(db)) {
ProgressMonitor pm = new TextProgressMonitor();
pm.beginTask("Collecting accounts", ProgressMonitor.UNKNOWN);
Set<Account> accounts = scanAccounts(db, pm);
pm.endTask();
pm.beginTask("Migrating accounts to NoteDb", accounts.size());
for (Account account : accounts) {
updateAccountInNoteDb(repo, account);
pm.update(1);
}
pm.endTask();
}
} catch (IOException | ConfigInvalidException e) {
throw new OrmException("Migrating accounts to NoteDb failed", e);
}
}
private Set<Account> scanAccounts(ReviewDb db) throws SQLException {
private Set<Account> scanAccounts(ReviewDb db, ProgressMonitor pm) throws SQLException {
try (Statement stmt = newStatement(db);
ResultSet rs =
stmt.executeQuery(
@@ -85,6 +94,7 @@ public class Schema_154 extends SchemaVersion {
a.setStatus(rs.getString(5));
a.setActive(rs.getString(6).equals("N"));
s.add(a);
pm.update(1);
}
return s;
}