Skip to content

Commit

Permalink
Changes to support replication plugin on OpenSearch v2.2.0
Browse files Browse the repository at this point in the history
Signed-off-by: Sai Kumar <[email protected]>
  • Loading branch information
saikaranam-amazon committed Aug 3, 2022
1 parent db5029a commit c25bfc4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import org.opensearch.gradle.test.RestIntegTestTask
buildscript {
ext {
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
// e.g. 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
Expand All @@ -50,7 +50,7 @@ buildscript {


// for bwc tests
opensearch_previous_version = System.getProperty("bwc_older_version", "1.3.1")
opensearch_previous_version = System.getProperty("bwc_older_version", "2.1.0")
plugin_previous_version = opensearch_previous_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')

common_utils_version = System.getProperty("common_utils.version", opensearch_build)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import org.opensearch.action.admin.indices.settings.put.UpdateSettingsClusterSta
import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest
import org.opensearch.action.support.ActionFilters
import org.opensearch.action.support.IndicesOptions
import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction
import org.opensearch.action.support.master.AcknowledgedResponse
import org.opensearch.action.support.master.TransportMasterNodeAction
import org.opensearch.cluster.ClusterState
import org.opensearch.cluster.ack.ClusterStateUpdateResponse
import org.opensearch.cluster.ack.OpenIndexClusterStateUpdateResponse
Expand Down Expand Up @@ -61,7 +61,7 @@ class TransportUpdateMetadataAction @Inject constructor(
val updateSettingsService: MetadataUpdateSettingsService,
val indexAliasService: MetadataIndexAliasesService,
val indexStateService: MetadataIndexStateService
) : TransportMasterNodeAction<UpdateMetadataRequest, AcknowledgedResponse>(UpdateMetadataAction.NAME,
) : TransportClusterManagerNodeAction<UpdateMetadataRequest, AcknowledgedResponse>(UpdateMetadataAction.NAME,
transportService, clusterService, threadPool, actionFilters, ::UpdateMetadataRequest, indexNameExpressionResolver) {

companion object {
Expand All @@ -75,7 +75,7 @@ class TransportUpdateMetadataAction @Inject constructor(
return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE)
}

override fun masterOperation(
override fun clusterManagerOperation(
task: Task,
request: UpdateMetadataRequest,
state: ClusterState,
Expand Down Expand Up @@ -286,7 +286,7 @@ class TransportUpdateMetadataAction @Inject constructor(
}
}

override fun masterOperation(request: UpdateMetadataRequest?, state: ClusterState?, listener: ActionListener<AcknowledgedResponse>?) {
override fun clusterManagerOperation(request: UpdateMetadataRequest?, state: ClusterState?, listener: ActionListener<AcknowledgedResponse>?) {
throw UnsupportedOperationException("The task parameter is required")
}

Expand Down

0 comments on commit c25bfc4

Please sign in to comment.