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

[Remote Store] Moving stale commit deletion to async flow #8201

Merged

Conversation

psychbot
Copy link
Member

@psychbot psychbot commented Jun 21, 2023

Description

Changes to move the stale commit deletion logic to async flow.

Related Issues

Resolves #4315

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Jun 21, 2023

Codecov Report

Merging #8201 (5c446f3) into main (b594f52) will decrease coverage by 0.02%.
The diff coverage is 86.95%.

@@             Coverage Diff              @@
##               main    #8201      +/-   ##
============================================
- Coverage     70.86%   70.84%   -0.02%     
+ Complexity    56825    56768      -57     
============================================
  Files          4752     4752              
  Lines        268599   268610      +11     
  Branches      39336    39336              
============================================
- Hits         190335   190292      -43     
- Misses        62235    62243       +8     
- Partials      16029    16075      +46     
Impacted Files Coverage Δ
...in/java/org/opensearch/index/shard/IndexShard.java 69.21% <0.00%> (-0.33%) ⬇️
...java/org/opensearch/index/shard/StoreRecovery.java 57.25% <0.00%> (-0.42%) ⬇️
...search/index/shard/RemoteStoreRefreshListener.java 85.56% <100.00%> (-4.39%) ⬇️
...earch/index/store/RemoteSegmentStoreDirectory.java 91.91% <100.00%> (+1.86%) ⬆️
...ndex/store/RemoteSegmentStoreDirectoryFactory.java 95.65% <100.00%> (+0.19%) ⬆️
server/src/main/java/org/opensearch/node/Node.java 84.95% <100.00%> (ø)

... and 435 files with indirect coverage changes

Copy link
Member

@ashking94 ashking94 left a comment

Choose a reason for hiding this comment

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

have left couple of comments, do take a look

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testDropPrimaryDuringReplication

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testNodeDropWithOngoingReplication

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
@psychbot psychbot force-pushed the delete-stale-commits-async-flow branch from 63e08cf to 45b8233 Compare June 29, 2023 17:25
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Copy link
Member

@ashking94 ashking94 left a comment

Choose a reason for hiding this comment

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

Left some minor comments, please take a look.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testNodeDropWithOngoingReplication
      1 org.opensearch.remotestore.RemoteStoreIT.testRemoteTranslogCleanup
      1 org.opensearch.remotestore.RemoteStoreIT.testRemoteTranslogCleanup
      1 org.opensearch.remotestore.RemoteStoreIT.testRemoteSegmentCleanup

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Copy link
Member

@ashking94 ashking94 left a comment

Choose a reason for hiding this comment

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

LGTM

@sachinpkale
Copy link
Member

Build failure due to flaky tests.

@github-actions
Copy link
Contributor

github-actions bot commented Jul 3, 2023

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testNodeDropWithOngoingReplication

@sachinpkale sachinpkale merged commit 1d22740 into opensearch-project:main Jul 3, 2023
@sachinpkale sachinpkale added the backport 2.x Backport to 2.x branch label Jul 3, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8201-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1d2274045b42e129b8c06748f8185d2431aa5336
# Push it to GitHub
git push --set-upstream origin backport/backport-8201-to-2.x
# Go back to the original working tree
popd
# 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-8201-to-2.x.

psychbot added a commit to psychbot/OpenSearch that referenced this pull request Jul 5, 2023
…ow (opensearch-project#8201)

---------

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
sachinpkale pushed a commit that referenced this pull request Jul 5, 2023
…ow (#8201) (#8442)

---------

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
buddharajusahil pushed a commit to buddharajusahil/OpenSearch that referenced this pull request Jul 18, 2023
…-project#8201)

---------

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
Signed-off-by: sahil buddharaju <sahilbud@amazon.com>
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…-project#8201)

---------

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…-project#8201)

---------

Signed-off-by: Dharmesh 💤 <sdharms@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Remote Store] Delete stale commits in async flow
6 participants