misc changes

opendistro-for-elasticsearch · Sep 11, 2020 · 4115f97 · 4115f97
1 parent 71234c6
commit 4115f97
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/...endistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerResponse.kt b/...endistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerResponse.kt
@@ -54,7 +54,7 @@ class RefreshSearchAnalyzerResponse : BroadcastResponse {
     override fun toXContent(builder: XContentBuilder, params: Params?): XContentBuilder? {
         builder.startObject()
         RestActions.buildBroadcastShardsHeader(builder, params, totalShards, successfulShards, -1, failedShards, shardFailures.toTypedArray())
-        builder.startArray("successful_refreshes")
+        builder.startArray("successful_refresh_details")
         val successfulIndices = getSuccessfulRefreshDetails()
         for (index in successfulIndices.keys) {
             val reloadedAnalyzers = successfulIndices.get(index)!!

diff --git a/...oforelasticsearch/indexmanagement/refreshanalyzer/TransportRefreshSearchAnalyzerAction.kt b/...oforelasticsearch/indexmanagement/refreshanalyzer/TransportRefreshSearchAnalyzerAction.kt
@@ -106,12 +106,12 @@ class TransportRefreshSearchAnalyzerAction :
         return clusterState.routingTable().allShards(concreteIndices)
     }
 
-    override fun checkGlobalBlock(state: ClusterState, request: RefreshSearchAnalyzerRequest?): ClusterBlockException {
+    override fun checkGlobalBlock(state: ClusterState, request: RefreshSearchAnalyzerRequest?): ClusterBlockException? {
         return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE)
     }
 
     override fun checkRequestBlock(state: ClusterState, request: RefreshSearchAnalyzerRequest?, concreteIndices: Array<String?>?):
-            ClusterBlockException {
+            ClusterBlockException? {
         return state.blocks().indicesBlockedException(ClusterBlockLevel.METADATA_WRITE, concreteIndices)
     }
 }
diff --git a/...endistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerActionIT.kt b/...endistroforelasticsearch/indexmanagement/refreshanalyzer/RefreshSearchAnalyzerActionIT.kt
@@ -42,7 +42,6 @@ class RefreshSearchAnalyzerActionIT : IndexManagementRestTestCase() {
         createIndex(indexName, settings, getAnalyzerMapping())
         ingestData(indexName)
 
-//        Thread.sleep(1000) // wait for refresh interval
         assertTrue(queryData(indexName, "hello").contains("hello world"))
 
         // check synonym
@@ -89,7 +88,6 @@ class RefreshSearchAnalyzerActionIT : IndexManagementRestTestCase() {
         createIndex(indexName, settings, getAnalyzerMapping())
         ingestData(indexName)
 
-//        Thread.sleep(1000) // wait for refresh interval
         assertTrue(queryData(indexName, "hello").contains("hello world"))
 
         // check synonym
@@ -138,7 +136,6 @@ class RefreshSearchAnalyzerActionIT : IndexManagementRestTestCase() {
         createIndex(indexName, settings, getAnalyzerMapping(), aliasSettings)
         ingestData(indexName)
 
-//        Thread.sleep(1000) // wait for refresh interval
         assertTrue(queryData(indexName, "hello").contains("hello world"))
 
         // check synonym