Fix breaking changes for 3.0.0 release #1424
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kaituo
requested review from
jmazanec15,
jngz-es,
saratvemulapalli,
ohltyler,
vamshin,
VijayanB,
ylwu-amzn,
amitgalitz,
jackiehanyang,
sean-zheng-amazon,
dbwiddis,
owaiskazi19 and
joshpalis
as code owners
opensearch-trigger-bot
bot
added
documentation
kaituo
changed the title
This PR updates imports and method references for bumping version to 3.0 alpha. Specifically, - Replace `import org.opensearch.client.Client;` with `import org.opensearch.transport.client.Client;` - Replace `getTotalHits().value` with `getTotalHits().value()` - Replace `import org.opensearch.action.support.master.AcknowledgedResponse;` with `import org.opensearch.action.support.clustermanager.AcknowledgedResponse;` - Replace `import org.opensearch.client.node.NodeClient;` with `import org.opensearch.transport.client.node.NodeClient;` - Replace `import org.opensearch.client.ClusterAdminClient;` with `import org.opensearch.transport.client.ClusterAdminClient;` - Replace `import org.opensearch.client.AdminClient;` with `import org.opensearch.transport.client.AdminClient;` - Replace `import org.opensearch.client.IndicesAdminClient;` with `import org.opensearch.transport.client.IndicesAdminClient;` - Rename `masterNodeId` to `clusterManagerNodeId` These changes align with similar PR: https://github.com/opensearch-project/flow-framework/pull/1026/files Testing done: * gradle build Signed-off-by: Kaituo Li <[email protected]>
66 tasks
amitgalitz
reviewed
Feb 21, 2025
| @@ -35,7 +35,7 @@ buildscript { | |||
| js_resource_folder = "src/test/resources/job-scheduler" | |||
| common_utils_version = System.getProperty("common_utils.version", opensearch_build) | |||
| job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build) | |||
| bwcVersionShort = "2.19.0" | |||
| bwcVersionShort = "2.20.0" | |||
There was a problem hiding this comment.
since 2.20 wont be released, should this stay 2.19 or it fails if its not 2.20?
There was a problem hiding this comment.
without doing it bwc test failed with
> `cluster{::securityBwcCluster0}` failed to wait for cluster health yellow after 40 SECONDS
IO error while waiting cluster
503 Service Unavailable
OpenSearch current major (3.0) is wire compatible only with last minor of previous major (2.20). Read opensearch-project/OpenSearch#5076 and opensearch-project/OpenSearch#5076
There was a problem hiding this comment.
I see, I assume that might need to change in future though if 2.20 is never released we will want for example 2.19.x be bwc with 3.0?
amitgalitz
approved these changes
Feb 21, 2025
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/anomaly-detection/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/anomaly-detection/backport-2.x
# Create a new branch
git switch --create backport/backport-1424-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b6ded29330f17357f7ac98432241a0a88187f6c4
# Push it to GitHub
git push --set-upstream origin backport/backport-1424-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/anomaly-detection/backport-2.xThen, create a pull request where the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR updates imports and method references for bumping version to 3.0 alpha.
Specifically,
import org.opensearch.client.Client;withimport org.opensearch.transport.client.Client;getTotalHits().valuewithgetTotalHits().value()import org.opensearch.action.support.master.AcknowledgedResponse;withimport org.opensearch.action.support.clustermanager.AcknowledgedResponse;import org.opensearch.client.node.NodeClient;withimport org.opensearch.transport.client.node.NodeClient;import org.opensearch.client.ClusterAdminClient;withimport org.opensearch.transport.client.ClusterAdminClient;import org.opensearch.client.AdminClient;withimport org.opensearch.transport.client.AdminClient;import org.opensearch.client.IndicesAdminClient;withimport org.opensearch.transport.client.IndicesAdminClient;masterNodeIdtoclusterManagerNodeIdThese changes align with similar PR: https://github.com/opensearch-project/flow-framework/pull/1026/files
Testing done:
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
opensearch-project/OpenSearch#3351
Check List
--signoff.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.