summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2019-02-07 14:26:03 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2019-02-07 15:32:43 +0900
commit5b2d3e6e8aa999898f41b14d41555b7741b8dba7 (patch)
treea15f18905f5a7e0b2c93964c0c4100b453a3279c
parent1c1e7aa7026f04829826f89864c637ec19233e3e (diff)
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
-rw-r--r--gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java3
1 files changed, 2 insertions, 1 deletions
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 4f30e437df..eb244db6a6 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 @@ public class Daemon extends SiteProgram {
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());