opendev
/
gerrit
Code Issues Proposed changes

MigrateToNoteDb: Fix GitRefUpdated binding 

ReindexAfterRefUpdate is not what we want at all; reindexing is handled
specially at the end of the process. This was probably a copy/paste
error.

Do bind GitRefUpdated to DISABLED, which may be what was intended here,
and even if not, is likely a good idea anyway.

Change-Id: I7785d02a6c5aa44fd4baa3f616044580ffff9a56
This commit is contained in:
Dave Borowitz 2017-08-21 15:16:19 -04:00
parent 9ef9a4b557
commit 00ed781030
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java
View File

@ -21,8 +21,6 @@ import static java.util.stream.Collectors.toList;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.pgm.util.BatchProgramModule;
import com.google.gerrit.pgm.util.RuntimeShutdown;
@ -31,8 +29,8 @@ import com.google.gerrit.pgm.util.ThreadLimiter;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.index.DummyIndexModule;
import com.google.gerrit.server.index.change.ReindexAfterRefUpdate;
import com.google.gerrit.server.notedb.rebuild.NoteDbMigrator;
import com.google.inject.Inject;
import com.google.inject.Injector;
@ -161,8 +159,7 @@ public class MigrateToNoteDb extends SiteProgram {
@Override
public void configure() {
install(dbInjector.getInstance(BatchProgramModule.class));
DynamicSet.bind(binder(), GitReferenceUpdatedListener.class)
.to(ReindexAfterRefUpdate.class);
bind(GitReferenceUpdated.class).toInstance(GitReferenceUpdated.DISABLED);
install(new DummyIndexModule());
factory(ChangeResource.Factory.class);
}