De-couple online reindex activation from index module
Gerrit plugins can contribute to submit rules evaluation, that are a
part of secondary index. Therefore it is crucial that plugins are
loaded prior to triggering of online reindexing.
This change de-couples online reindex activation from index module and
thus postpones the triggering of online reindexing until after loading
of the plugins:
1. Load secondary index
2. Load all plugins
3. Trigger online reindex if needed
Bug: Issue 10082
Change-Id: I1706d42cb50eb342c2b9eca076e2def5bd1426c0
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java
index e78416d..6bc51ce 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java
@@ -25,20 +25,15 @@
public static ElasticIndexModule singleVersionWithExplicitVersions(
Map<String, Integer> versions, int threads) {
- return new ElasticIndexModule(versions, threads, false);
+ return new ElasticIndexModule(versions, threads);
}
- public static ElasticIndexModule latestVersionWithOnlineUpgrade() {
- return new ElasticIndexModule(null, 0, true);
+ public static ElasticIndexModule latestVersion() {
+ return new ElasticIndexModule(null, 0);
}
- public static ElasticIndexModule latestVersionWithoutOnlineUpgrade() {
- return new ElasticIndexModule(null, 0, false);
- }
-
- private ElasticIndexModule(
- Map<String, Integer> singleVersions, int threads, boolean onlineUpgrade) {
- super(singleVersions, threads, onlineUpgrade);
+ private ElasticIndexModule(Map<String, Integer> singleVersions, int threads) {
+ super(singleVersions, threads);
}
@Override
