Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to support replication plugin on OpenSearch v2.2.0 #469

Merged
merged 1 commit into from
Aug 4, 2022
Merged

Changes to support replication plugin on OpenSearch v2.2.0 #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/security-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
runs-on: ubuntu-latest
steps:
# This step uses the setup-java Github action: https://github.com/actions/setup-java
- name: Set Up JDK 11
- name: Set Up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
# This step uses the checkout Github action: https://github.com/actions/checkout
- name: Checkout Branch
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
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 All @@ -62,7 +62,7 @@ buildscript {
security_no_snapshot = opensearch_build.replace("-SNAPSHOT","")
security_plugin_path = "build/dependencies/security"
security_plugin_download_url = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/' + opensearch_no_snapshot +
'/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-security-' + security_no_snapshot + '.zip'
'/5858/linux/x64/tar/builds/opensearch/plugins/opensearch-security-' + security_no_snapshot + '.zip'

}

Expand Down
8 changes: 4 additions & 4 deletions src/main/kotlin/org/opensearch/replication/metadata/TransportUpdateMetadataAction.kt
View file
Open in desktop
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