commit 22310ffbab0eaf3257240b3c9213af1eeb5de01f
author David Pursehouse <david.pursehouse@sonymobile.com> Wed Nov 25 13:25:28 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Mon Nov 30 11:56:45 2015 +0900
tree 2668304f26140ac426178702398ce975a7a164ed
parent bee87af4be92d6c6f1c7220e004d36745140b8b8

Daemon: Don't add index commands when running as slave

Bug: Issue 3694
Change-Id: I3c50269452d9599b74044014090a30e134b3b6ec

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 39a5cbd..35a4cd5 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
@@ -278,7 +278,9 @@
     cfgInjector = createCfgInjector();
     config = cfgInjector.getInstance(
         Key.get(Config.class, GerritServerConfig.class));
-    initIndexType();
+    if (!slave) {
+      initIndexType();
+    }
     sysInjector = createSysInjector();
     sysInjector.getInstance(PluginGuiceEnvironment.class)
       .setDbCfgInjector(dbInjector, cfgInjector);
@@ -415,7 +417,7 @@
     }
     modules.add(new DefaultCommandModule(slave,
         sysInjector.getInstance(DownloadConfig.class)));
-    if (indexType == IndexType.LUCENE) {
+    if (!slave && indexType == IndexType.LUCENE) {
       modules.add(new IndexCommandsModule());
     }
     return sysInjector.createChildInjector(modules);