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.

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

Added a override function for finalizeSnapshot #1438

Merged
merged 3 commits into from
Sep 5, 2024

Conversation

nandnkum
Copy link
Contributor

@nandnkum nandnkum commented Sep 4, 2024

Description

Added an Priority parameter in finalizeSnapshot method in ( https://github.com/opensearch-project/cross-cluster-replication/blob/2.17/src/main/kotlin/org/opensearch/replication/repository/RemoteClusterRepository.kt )

Related Issues

CCR Build was getting failed due to change in finalizeSnapshot method in opensearch repo and hence needed to overridden.

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

@nandnkum nandnkum mentioned this pull request Sep 4, 2024
23 tasks
Signed-off-by: nandan <[email protected]>
@@ -74,6 +74,7 @@ import java.util.UUID
import java.util.function.Consumer
import java.util.function.Function
import kotlin.collections.ArrayList
import org.opensearch.common.Priority
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reorder ?

@ankitkala ankitkala merged commit 735b1f1 into opensearch-project:main Sep 5, 2024
9 of 13 checks passed
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1438-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 735b1f143ca14842cf4dc0fbe93ca91044413de7
# Push it to GitHub
git push --set-upstream origin backport/backport-1438-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1438-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants