opendev/gerrit
Code Issues Proposed changes

ElasticVersionManager: Use correct configuration value for prefix

Browse Source 
In change I4c6e68783 the configuration option was renamed from
index.prefix to elasticsearch.prefix, and since change I9d089b6a0 it
is not set by default.

As a result, the ElasticIndexVersionDiscovery.discover does not get the
expected results from the _aliases query, and the available versions
are not returned.

Bug: Issue 9041
Change-Id: Ibd00827e5462d6d47cc8a250ba6d29232dccefea
This commit is contained in:
David Pursehouse
2018-05-30 10:55:17 +09:00
parent 9f001d2f16
commit 63e278fe44
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersionManager.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.elasticsearch;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.common.primitives.Ints;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.server.config.GerritServerConfig;
@@ -48,7 +48,7 @@ public class ElasticVersionManager extends AbstractVersionManager implements Lif
ElasticIndexVersionDiscovery versionDiscovery) {
super(cfg, sitePaths, defs);
this.versionDiscovery = versionDiscovery;
prefix = MoreObjects.firstNonNull(cfg.getString("index", null, "prefix"), "gerrit");
prefix = Strings.nullToEmpty(cfg.getString("elasticsearch", null, "prefix"));
}
@Override