Return reloaded analyzers in _reload_search_ananlyzer response

Christoph Büscher · Christoph Büscher · commit 35788708cf2a · 2019-07-02T15:31:39.000+02:00
Currently the repsonse of the "_reload_search_analyzer" endpoint contains the index names and nodeIds of indices were analyzers reloading was triggered. This change add the names of the search-time analyzers that were reloaded. Closes #43804
diff --git a/docs/reference/indices/apis/reload-analyzers.asciidoc b/docs/reference/indices/apis/reload-analyzers.asciidoc
@@ -69,4 +69,33 @@ reload to ensure the new state of the file is reflected everywhere in the cluste
 POST /my_index/_reload_search_analyzers
 --------------------------------------------------
 // CONSOLE
-// TEST[s/^/PUT my_index\n/]
+// TEST[continued]
+
+The reload request returns information about the nodes it was executed on and the
+analyzers that were reloaded:
+
+[source,js]
+--------------------------------------------------
+{
+    "_shards" : {
+        "total" : 2,
+        "successful" : 2,
+        "failed" : 0
+    },
+    "reload_details" : [
+        {
+            "index" : "my_index",
+            "reloaded_analyzers" : [
+                "my_synonyms" 
+            ],
+            "reloaded_node_ids" : [
+                "mfdqTXn_T7SGr2Ho2KT8uw"
+            ]
+        }
+    ]
+}
+--------------------------------------------------
+// TEST[continued]
+// TESTRESPONSE[s/"total" : 2/"total" : $body._shards.total/]
+// TESTRESPONSE[s/"successful" : 2/"successful" : $body._shards.successful/]
+// TESTRESPONSE[s/mfdqTXn_T7SGr2Ho2KT8uw/$body.reload_details.0.reloaded_node_ids.0/]
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -21,6 +21,7 @@
 
 import com.carrotsearch.hppc.ObjectHashSet;
 import com.carrotsearch.hppc.cursors.ObjectCursor;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.lucene.analysis.Analyzer;
@@ -847,19 +848,23 @@ protected Analyzer getWrappedAnalyzer(String fieldName) {
         }
     }
 
-    public synchronized void reloadSearchAnalyzers(AnalysisRegistry registry) throws IOException {
+    public synchronized List<String> reloadSearchAnalyzers(AnalysisRegistry registry) throws IOException {
         logger.info("reloading search analyzers");
         // refresh indexAnalyzers and search analyzers
         final Map<String, TokenizerFactory> tokenizerFactories = registry.buildTokenizerFactories(indexSettings);
         final Map<String, CharFilterFactory> charFilterFactories = registry.buildCharFilterFactories(indexSettings);
         final Map<String, TokenFilterFactory> tokenFilterFactories = registry.buildTokenFilterFactories(indexSettings);
         final Map<String, Settings> settings = indexSettings.getSettings().getGroups("index.analysis.analyzer");
+        final List<String> reloadedAnalyzers = new ArrayList<>();
         for (NamedAnalyzer namedAnalyzer : indexAnalyzers.getAnalyzers().values()) {
             if (namedAnalyzer.analyzer() instanceof ReloadableCustomAnalyzer) {
                 ReloadableCustomAnalyzer analyzer = (ReloadableCustomAnalyzer) namedAnalyzer.analyzer();
-                Settings analyzerSettings = settings.get(namedAnalyzer.name());
-                analyzer.reload(namedAnalyzer.name(), analyzerSettings, tokenizerFactories, charFilterFactories, tokenFilterFactories);
+                String analyzerName = namedAnalyzer.name();
+                Settings analyzerSettings = settings.get(analyzerName);
+                analyzer.reload(analyzerName, analyzerSettings, tokenizerFactories, charFilterFactories, tokenFilterFactories);
+                reloadedAnalyzers.add(analyzerName);
             }
         }
+        return reloadedAnalyzers;
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/ReloadAnalyzersResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/ReloadAnalyzersResponse.java
@@ -8,18 +8,20 @@
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.ParseField;
-import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.xpack.core.action.TransportReloadAnalyzersAction.ReloadResult;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
 
@@ -28,16 +30,25 @@
  */
 public class ReloadAnalyzersResponse extends BroadcastResponse  {
 
-    private final Map<String, List<String>> reloadedIndicesNodes;
+    private final Map<String, ReloadDetails> reloadDetails;
+    private static final ParseField RELOAD_DETAILS_FIELD = new ParseField("reload_details");
+    private static final ParseField INDEX_FIELD = new ParseField("index");
+    private static final ParseField RELOADED_ANALYZERS_FIELD = new ParseField("reloaded_analyzers");
+    private static final ParseField RELOADED_NODE_IDS_FIELD = new ParseField("reloaded_node_ids");
+
 
     public ReloadAnalyzersResponse() {
-        reloadedIndicesNodes = Collections.emptyMap();
+        reloadDetails = Collections.emptyMap();
     }
 
     public ReloadAnalyzersResponse(int totalShards, int successfulShards, int failedShards,
-            List<DefaultShardOperationFailedException> shardFailures, Map<String, List<String>> reloadedIndicesNodes) {
+            List<DefaultShardOperationFailedException> shardFailures, Map<String, ReloadDetails> reloadedIndicesNodes) {
         super(totalShards, successfulShards, failedShards, shardFailures);
-        this.reloadedIndicesNodes = reloadedIndicesNodes;
+        this.reloadDetails = reloadedIndicesNodes;
+    }
+
+    public final Map<String, ReloadDetails> getReloadDetails() {
+        return this.reloadDetails;
     }
 
     public Map<String, List<String>> getReloadedIndicesNodes() {
@@ -49,11 +60,13 @@ public Map<String, List<String>> getReloadedIndicesNodes() {
      */
     @Override
     protected void addCustomXContentFields(XContentBuilder builder, Params params) throws IOException {
-        builder.startArray("reloaded_nodes");
-        for (Entry<String, List<String>> indexNodesReloaded : reloadedIndicesNodes.entrySet()) {
+        builder.startArray(RELOAD_DETAILS_FIELD.getPreferredName());
+        for (Entry<String, ReloadDetails> indexDetails : reloadDetails.entrySet()) {
             builder.startObject();
-            builder.field("index", indexNodesReloaded.getKey());
-            builder.field("reloaded_node_ids", indexNodesReloaded.getValue());
+            ReloadDetails value = indexDetails.getValue();
+            builder.field(INDEX_FIELD.getPreferredName(), value.getIndexName());
+            builder.field(RELOADED_ANALYZERS_FIELD.getPreferredName(), value.getReloadedAnalyzers());
+            builder.field(RELOADED_NODE_IDS_FIELD.getPreferredName(), value.getReloadedIndicesNodes());
             builder.endObject();
         }
         builder.endArray();
@@ -63,31 +76,61 @@ protected void addCustomXContentFields(XContentBuilder builder, Params params) t
     private static final ConstructingObjectParser<ReloadAnalyzersResponse, Void> PARSER = new ConstructingObjectParser<>("reload_analyzer",
             true, arg -> {
                 BroadcastResponse response = (BroadcastResponse) arg[0];
-                List<Tuple<String, List<String>>> results = (List<Tuple<String, List<String>>>) arg[1];
-                Map<String, List<String>> reloadedNodeIds = new HashMap<>();
-                for (Tuple<String, List<String>> result : results) {
-                    reloadedNodeIds.put(result.v1(), result.v2());
+                List<ReloadDetails> results = (List<ReloadDetails>) arg[1];
+                Map<String, ReloadDetails> reloadedNodeIds = new HashMap<>();
+                for (ReloadDetails result : results) {
+                    reloadedNodeIds.put(result.getIndexName(), result);
                 }
                 return new ReloadAnalyzersResponse(response.getTotalShards(), response.getSuccessfulShards(), response.getFailedShards(),
                         Arrays.asList(response.getShardFailures()), reloadedNodeIds);
             });
 
     @SuppressWarnings({ "unchecked" })
-    private static final ConstructingObjectParser<Tuple<String, List<String>>, Void> ENTRY_PARSER = new ConstructingObjectParser<>(
+    private static final ConstructingObjectParser<ReloadDetails, Void> ENTRY_PARSER = new ConstructingObjectParser<>(
             "reload_analyzer.entry", true, arg -> {
-                String index = (String) arg[0];
-                List<String> nodeIds = (List<String>) arg[1];
-                return new Tuple<>(index, nodeIds);
+                return new ReloadDetails((String) arg[0], new HashSet<>((List<String>) arg[1]), new HashSet<>((List<String>) arg[2]));
             });
 
     static {
         declareBroadcastFields(PARSER);
-        PARSER.declareObjectArray(constructorArg(), ENTRY_PARSER, new ParseField("reloaded_nodes"));
-        ENTRY_PARSER.declareString(constructorArg(), new ParseField("index"));
-        ENTRY_PARSER.declareStringArray(constructorArg(), new ParseField("reloaded_node_ids"));
+        PARSER.declareObjectArray(constructorArg(), ENTRY_PARSER, RELOAD_DETAILS_FIELD);
+        ENTRY_PARSER.declareString(constructorArg(), INDEX_FIELD);
+        ENTRY_PARSER.declareStringArray(constructorArg(), RELOADED_ANALYZERS_FIELD);
+        ENTRY_PARSER.declareStringArray(constructorArg(), RELOADED_NODE_IDS_FIELD);
     }
 
     public static ReloadAnalyzersResponse fromXContent(XContentParser parser) {
         return PARSER.apply(parser, null);
     }
+
+    public static class ReloadDetails {
+
+        private final String indexName;
+        private final Set<String> reloadedIndicesNodes;
+        private final Set<String> reloadedAnalyzers;
+
+        ReloadDetails(String name, Set<String> reloadedIndicesNodes, Set<String> reloadedAnalyzers) {
+            this.indexName = name;
+            this.reloadedIndicesNodes = reloadedIndicesNodes;
+            this.reloadedAnalyzers = reloadedAnalyzers;
+        }
+
+        public String getIndexName() {
+            return indexName;
+        }
+
+        public Set<String> getReloadedIndicesNodes() {
+            return reloadedIndicesNodes;
+        }
+
+        public Set<String> getReloadedAnalyzers() {
+            return reloadedAnalyzers;
+        }
+
+        void merge(ReloadResult other) {
+            assert this.indexName == other.index;
+            this.reloadedAnalyzers.addAll(other.reloadedSearchAnalyzers);
+            this.reloadedIndicesNodes.add(other.nodeId);
+        }
+    }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportReloadAnalyzersAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/TransportReloadAnalyzersAction.java
@@ -29,6 +29,7 @@
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
+import org.elasticsearch.xpack.core.action.ReloadAnalyzersResponse.ReloadDetails;
 import org.elasticsearch.xpack.core.action.TransportReloadAnalyzersAction.ReloadResult;
 
 import java.io.IOException;
@@ -67,18 +68,18 @@ protected ReloadResult readShardResult(StreamInput in) throws IOException {
     @Override
     protected ReloadAnalyzersResponse newResponse(ReloadAnalyzersRequest request, int totalShards, int successfulShards, int failedShards,
             List<ReloadResult> responses, List<DefaultShardOperationFailedException> shardFailures, ClusterState clusterState) {
-        Map<String, List<String>> reloadedIndicesNodes = new HashMap<String, List<String>>();
+        Map<String, ReloadDetails> reloadedIndicesDetails = new HashMap<String, ReloadDetails>();
         for (ReloadResult result : responses) {
-            if (reloadedIndicesNodes.containsKey(result.index)) {
-                List<String> nodes = reloadedIndicesNodes.get(result.index);
-                nodes.add(result.nodeId);
+            if (reloadedIndicesDetails.containsKey(result.index)) {
+                reloadedIndicesDetails.get(result.index).merge(result);;
             } else {
-                List<String> nodes = new ArrayList<>();
-                nodes.add(result.nodeId);
-                reloadedIndicesNodes.put(result.index, nodes);
+                HashSet<String> nodeIds = new HashSet<String>();
+                nodeIds.add(result.nodeId);
+                ReloadDetails details = new ReloadDetails(result.index, nodeIds, new HashSet<String>(result.reloadedSearchAnalyzers));
+                reloadedIndicesDetails.put(result.index, details);
             }
         }
-        return new ReloadAnalyzersResponse(totalShards, successfulShards, failedShards, shardFailures, reloadedIndicesNodes);
+        return new ReloadAnalyzersResponse(totalShards, successfulShards, failedShards, shardFailures, reloadedIndicesDetails);
     }
 
     @Override
@@ -92,17 +93,19 @@ protected ReloadAnalyzersRequest readRequestFrom(StreamInput in) throws IOExcept
     protected ReloadResult shardOperation(ReloadAnalyzersRequest request, ShardRouting shardRouting) throws IOException {
         logger.info("reloading analyzers for index shard " + shardRouting);
         IndexService indexService = indicesService.indexService(shardRouting.index());
-        indexService.mapperService().reloadSearchAnalyzers(indicesService.getAnalysis());
-        return new ReloadResult(shardRouting.index().getName(), shardRouting.currentNodeId());
+        List<String> reloadedSearchAnalyzers = indexService.mapperService().reloadSearchAnalyzers(indicesService.getAnalysis());
+        return new ReloadResult(shardRouting.index().getName(), shardRouting.currentNodeId(), reloadedSearchAnalyzers);
     }
 
-    public static final class ReloadResult implements Streamable {
+    static final class ReloadResult implements Streamable {
         String index;
         String nodeId;
+        List<String> reloadedSearchAnalyzers;
 
-        private ReloadResult(String index, String nodeId) {
+        private ReloadResult(String index, String nodeId, List<String> reloadedSearchAnalyzers) {
             this.index = index;
             this.nodeId = nodeId;
+            this.reloadedSearchAnalyzers = reloadedSearchAnalyzers;
         }
 
         private ReloadResult() {
@@ -112,12 +115,14 @@ private ReloadResult() {
         public void readFrom(StreamInput in) throws IOException {
             this.index = in.readString();
             this.nodeId = in.readString();
+            this.reloadedSearchAnalyzers = in.readStringList();
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             out.writeString(index);
             out.writeString(nodeId);
+            out.writeStringCollection(this.reloadedSearchAnalyzers);
         }
     }
 
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/ReloadAnalyzersResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/ReloadAnalyzersResponseTests.java
@@ -9,27 +9,31 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.test.AbstractBroadcastResponseTestCase;
-import org.elasticsearch.xpack.core.action.ReloadAnalyzersResponse;
+import org.elasticsearch.xpack.core.action.ReloadAnalyzersResponse.ReloadDetails;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class ReloadAnalyzersResponseTests extends AbstractBroadcastResponseTestCase<ReloadAnalyzersResponse> {
 
     @Override
     protected ReloadAnalyzersResponse createTestInstance(int totalShards, int successfulShards, int failedShards,
                                                  List<DefaultShardOperationFailedException> failures) {
-        Map<String, List<String>> reloadedIndicesNodes = new HashMap<>();
+        Map<String, ReloadDetails> reloadedIndicesDetails = new HashMap<>();
         int randomIndices = randomIntBetween(0, 5);
         for (int i = 0; i < randomIndices; i++) {
-            List<String> randomNodeIds = Arrays.asList(generateRandomStringArray(5, 5, false, true));
-            reloadedIndicesNodes.put(randomAlphaOfLengthBetween(5, 10), randomNodeIds);
+            String name = randomAlphaOfLengthBetween(5, 10);
+            Set<String> reloadedIndicesNodes = new HashSet<>(Arrays.asList(generateRandomStringArray(5, 5, false, true)));
+            Set<String> reloadedAnalyzers = new HashSet<>(Arrays.asList(generateRandomStringArray(5, 5, false, true)));
+            reloadedIndicesDetails.put(name, new ReloadDetails(name, reloadedIndicesNodes, reloadedAnalyzers));
         }
-        return new ReloadAnalyzersResponse(totalShards, successfulShards, failedShards, failures, reloadedIndicesNodes);
+        return new ReloadAnalyzersResponse(totalShards, successfulShards, failedShards, failures, reloadedIndicesDetails);
     }
 
     @Override
@@ -39,12 +43,13 @@ protected ReloadAnalyzersResponse doParseInstance(XContentParser parser) throws
 
     @Override
     public void testToXContent() {
-        Map<String, List<String>> reloadedIndicesNodes = Collections.singletonMap("index", Collections.singletonList("nodeId"));
+        Map<String, ReloadDetails> reloadedIndicesNodes = Collections.singletonMap("index",
+                new ReloadDetails("index", Collections.singleton("nodeId"), Collections.singleton("my_analyzer")));
         ReloadAnalyzersResponse response = new ReloadAnalyzersResponse(10, 5, 5, null, reloadedIndicesNodes);
         String output = Strings.toString(response);
         assertEquals(
                 "{\"_shards\":{\"total\":10,\"successful\":5,\"failed\":5},"
-                + "\"reloaded_nodes\":[{\"index\":\"index\",\"reloaded_node_ids\":[\"nodeId\"]}]"
+                + "\"reload_details\":[{\"index\":\"index\",\"reloaded_analyzers\":[\"my_analyzer\"],\"reloaded_node_ids\":[\"nodeId\"]}]"
                 + "}",
                 output);
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/ReloadSynonymAnalyzerTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/ReloadSynonymAnalyzerTests.java
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/rest/action/ReloadSynonymAnalyzerIT.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/rest/action/ReloadSynonymAnalyzerIT.java

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`
`22`	`22`	`import com.carrotsearch.hppc.ObjectHashSet;`
`23`	`23`	`import com.carrotsearch.hppc.cursors.ObjectCursor;`
	`24`	`+`
`24`	`25`	`import org.apache.logging.log4j.LogManager;`
`25`	`26`	`import org.apache.logging.log4j.message.ParameterizedMessage;`
`26`	`27`	`import org.apache.lucene.analysis.Analyzer;`
`@@ -847,19 +848,23 @@ protected Analyzer getWrappedAnalyzer(String fieldName) {`
`847`	`848`	`}`
`848`	`849`	`}`
`849`	`850`
`850`		`- public synchronized void reloadSearchAnalyzers(AnalysisRegistry registry) throws IOException {`
	`851`	`+ public synchronized List<String> reloadSearchAnalyzers(AnalysisRegistry registry) throws IOException {`
`851`	`852`	`logger.info("reloading search analyzers");`
`852`	`853`	`// refresh indexAnalyzers and search analyzers`
`853`	`854`	`final Map<String, TokenizerFactory> tokenizerFactories = registry.buildTokenizerFactories(indexSettings);`
`854`	`855`	`final Map<String, CharFilterFactory> charFilterFactories = registry.buildCharFilterFactories(indexSettings);`
`855`	`856`	`final Map<String, TokenFilterFactory> tokenFilterFactories = registry.buildTokenFilterFactories(indexSettings);`
`856`	`857`	`final Map<String, Settings> settings = indexSettings.getSettings().getGroups("index.analysis.analyzer");`
	`858`	`+ final List<String> reloadedAnalyzers = new ArrayList<>();`
`857`	`859`	`for (NamedAnalyzer namedAnalyzer : indexAnalyzers.getAnalyzers().values()) {`
`858`	`860`	`if (namedAnalyzer.analyzer() instanceof ReloadableCustomAnalyzer) {`
`859`	`861`	`ReloadableCustomAnalyzer analyzer = (ReloadableCustomAnalyzer) namedAnalyzer.analyzer();`
`860`		`- Settings analyzerSettings = settings.get(namedAnalyzer.name());`
`861`		`- analyzer.reload(namedAnalyzer.name(), analyzerSettings, tokenizerFactories, charFilterFactories, tokenFilterFactories);`
	`862`	`+ String analyzerName = namedAnalyzer.name();`
	`863`	`+ Settings analyzerSettings = settings.get(analyzerName);`
	`864`	`+ analyzer.reload(analyzerName, analyzerSettings, tokenizerFactories, charFilterFactories, tokenFilterFactories);`
	`865`	`+ reloadedAnalyzers.add(analyzerName);`
`862`	`866`	`}`
`863`	`867`	`}`
	`868`	`+ return reloadedAnalyzers;`
`864`	`869`	`}`
`865`	`870`	`}`