opendev/gerrit
Code Issues Proposed changes

InitIndex: Set Elasticsearch index config under elasticsearch section

Browse Source 
When initializing the site with elasticsearch secondary index, the
elasticsearch prefix should be under a section named "elasticsearch",
and the server-specific configuration should be under a subsection
of "elasticsearch" with the server name as subsection name:

  [index]
        type = ELASTICSEARCH
  [elasticsearch]
        prefix = gerrit
  [elasticsearch "default"]
        protocol = http
        hostname = localhost
        port = 9200

rather than all under the "index" section:

  [index]
        type = ELASTICSEARCH
        protocol = http
        hostname = localhost
        port = 9200
        name = local

Bug: Issue 8523
Change-Id: I544769f25876735249404eb1c7eabece31ab3660
This commit is contained in:
David Pursehouse
2018-03-14 15:32:10 +09:00
committed by Marco Miller
parent 67d78639fc
commit 8c7ec285cc
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java
View File

@@ -40,6 +40,7 @@ class InitIndex implements InitStep {
private final SitePaths site;
private final InitFlags initFlags;
private final Section gerrit;
private final Section.Factory sections;
@Inject
InitIndex(ConsoleUI ui, Section.Factory sections, SitePaths site, InitFlags initFlags) {
@@ -48,6 +49,7 @@ class InitIndex implements InitStep {
this.gerrit = sections.get("gerrit", null);
this.site = site;
this.initFlags = initFlags;
this.sections = sections;
}
@Override
@@ -59,10 +61,15 @@ class InitIndex implements InitStep {
}
if (type == IndexType.ELASTICSEARCH) {
index.select("Transport protocol", "protocol", "http", Sets.newHashSet("http", "https"));
index.string("Hostname", "hostname", "localhost");
index.string("Port", "port", "9200");
index.string("Index Name", "name", "gerrit");
Section elasticsearch = sections.get("elasticsearch", null);
elasticsearch.string("Index Prefix", "prefix", "gerrit");
String name = ui.readString("default", "Server Name");
Section defaultServer = sections.get("elasticsearch", name);
defaultServer.select(
"Transport protocol", "protocol", "http", Sets.newHashSet("http", "https"));
defaultServer.string("Hostname", "hostname", "localhost");
defaultServer.string("Port", "port", "9200");
}
if ((site.isNew || isEmptySite()) && type == IndexType.LUCENE) {