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

[Backport] Initialize the leaderCheckpoint with follower shard's localCheckpoint… #951

Merged
merged 1 commit into from
Jun 2, 2023

Conversation

ankitkala
Copy link
Member

… (#904)

Original PR: https://github.com/opensearch-project/cross-cluster-replication/pull/904/files

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --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.

@codecov
Copy link

codecov bot commented Jun 2, 2023

Codecov Report

Merging #951 (a0bb65d) into 1.3 (d794efc) will increase coverage by 0.48%.
The diff coverage is 74.07%.

❗ Current head a0bb65d differs from pull request most recent head e3fb1d3. Consider uploading reports for the commit e3fb1d3 to get more accurate results

@@             Coverage Diff              @@
##                1.3     #951      +/-   ##
============================================
+ Coverage     72.42%   72.90%   +0.48%     
- Complexity     1003     1006       +3     
============================================
  Files           141      141              
  Lines          4681     4699      +18     
  Branches        523      524       +1     
============================================
+ Hits           3390     3426      +36     
+ Misses          963      944      -19     
- Partials        328      329       +1     
Impacted Files Coverage Δ
...ication/seqno/RemoteClusterRetentionLeaseHelper.kt 72.17% <69.56%> (+1.76%) ⬆️
...on/repository/RemoteClusterRestoreLeaderService.kt 78.37% <100.00%> (ø)
...rch/replication/task/index/IndexReplicationTask.kt 68.28% <100.00%> (ø)
...rch/replication/task/shard/ShardReplicationTask.kt 76.08% <100.00%> (+0.17%) ⬆️

... and 2 files with indirect coverage changes

@ankitkala ankitkala changed the title Initialize the leaderCheckpoint with follower shard's localCheckpoint… [Backport] Initialize the leaderCheckpoint with follower shard's localCheckpoint… Jun 2, 2023
@ankitkala ankitkala merged commit cd0a6b2 into opensearch-project:1.3 Jun 2, 2023
@opensearch-trigger-bot
Copy link

The backport to 1.1 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-1.1 1.1
# Navigate to the new working tree
cd .worktrees/backport-1.1
# Create a new branch
git switch --create backport/backport-951-to-1.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 cd0a6b21e5b85e2b06139249b4b9778ab350f005
# Push it to GitHub
git push --set-upstream origin backport/backport-951-to-1.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.1

Then, create a pull request where the base branch is 1.1 and the compare/head branch is backport/backport-951-to-1.1.

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