commit 5b2d3e6e8aa999898f41b14d41555b7741b8dba7
author David Pursehouse <dpursehouse@collab.net> Thu Feb 07 14:26:03 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Feb 07 15:32:43 2019 +0900
tree a15f18905f5a7e0b2c93964c0c4100b453a3279c
parent 1c1e7aa7026f04829826f89864c637ec19233e3e

Daemon: Don't install online reindexer in slave mode

Installing the online indexer in slave mode causes the daemon
startup to fail with:

  No implementation for com.google.gerrit.server.index.VersionManager
  was bound

when the online indexer starts.

Bug: Issue 10452
Change-Id: I0bfe06bd6e0095f94d4433e0ba95f12134da1062

gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
index 4f30e43..eb244db 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -413,7 +413,8 @@
     modules.add(new AuditModule());
     modules.add(new SignedTokenEmailTokenVerifier.Module());
     modules.add(new PluginModule());
-    if (VersionManager.getOnlineUpgrade(config)
+    if (!slave
+        && VersionManager.getOnlineUpgrade(config)
         // Schema upgrade is handled by OnlineNoteDbMigrator in this case.
         && !migrateToNoteDb()) {
       modules.add(new OnlineUpgrader.Module());