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

Add missing code in InternalEngine part of #10513 #11883

Merged
merged 1 commit into from
Jan 16, 2024

Conversation

ashking94
Copy link
Member

@ashking94 ashking94 commented Jan 15, 2024

Description

This PR adds the code missed from the backport of the PR #10513.

Related Issues

Resolves #10585 & #10513

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • 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.

Copy link
Contributor

github-actions bot commented Jan 15, 2024

Compatibility status:

Checks if related components are compatible with change d09a435

Incompatible components

Incompatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/performance-analyzer-rca.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/k-nn.git]

Copy link
Contributor

❕ Gradle check result for e4b070f: UNSTABLE

  • TEST FAILURES:
      2 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.classMethod
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshAfterCommit
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterRefresh
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterMultipleCommits
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterCommit

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Jan 15, 2024

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (cfbff9f) 71.12% compared to head (e4b070f) 70.77%.
Report is 1 commits behind head on 2.x.

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

Files Patch % Lines
...va/org/opensearch/index/engine/InternalEngine.java 0.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #11883      +/-   ##
============================================
- Coverage     71.12%   70.77%   -0.35%     
+ Complexity    59350    58983     -367     
============================================
  Files          4890     4890              
  Lines        279839   279841       +2     
  Branches      41035    41035              
============================================
- Hits         199037   198070     -967     
- Misses        63898    64884     +986     
+ Partials      16904    16887      -17     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

❕ Gradle check result for d09a435: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshAfterCommit
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterRefresh
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterMultipleCommits
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterCommit
      1 org.opensearch.index.shard.RemoteIndexShardTests.testNoFailuresOnFileReads

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@ashking94
Copy link
Member Author

ashking94 commented Jan 15, 2024

❕ Gradle check result for d09a435: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshAfterCommit
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterRefresh
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterMultipleCommits
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterCommit
      1 org.opensearch.index.shard.RemoteIndexShardTests.testNoFailuresOnFileReads

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Looks to be unrelated failures. All the failures (in RemoteStoreRefreshListenerTests class) shows as below -

java.lang.AssertionError: 
Expected: an empty collection
     but: <[org.apache.logging.log4j.spi.AbstractLogger caught java.util.ConcurrentModificationException logging ReusableParameterizedMessage: metadataFilesEligibleToDelete={} metadataFilesToBeDeleted={}, org.apache.logging.log4j.spi.AbstractLogger caught java.util.ConcurrentModificationException logging ReusableParameterizedMessage: metadataFilesEligibleToDelete={} metadataFilesToBeDeleted={}, org.apache.logging.log4j.spi.AbstractLogger caught java.util.ConcurrentModificationException logging ReusableParameterizedMessage: metadataFilesEligibleToDelete={} metadataFilesToBeDeleted={}, org.apache.logging.log4j.spi.AbstractLogger caught java.util.ConcurrentModificationException logging ReusableParameterizedMessage: metadataFilesEligibleToDelete={} metadataFilesToBeDeleted={}, org.apache.logging.log4j.spi.AbstractLogger caught java.util.ConcurrentModificationException logging ReusableParameterizedMessage: metadataFilesEligibleToDelete={} metadataFilesToBeDeleted={}]>

Tried reproducing this issue on my machine and dont see it failing after 500 iterations for org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterMultipleCommits

@gbbafna gbbafna merged commit c48fb55 into opensearch-project:2.x Jan 16, 2024
80 of 82 checks passed
@ashking94 ashking94 added backport 2.x Backport to 2.x branch and removed backport 2.x Backport to 2.x branch labels Feb 9, 2024
@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-11883-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c48fb5535859403e4a12090d686b21b62b3c76a9
# Push it to GitHub
git push --set-upstream origin backport/backport-11883-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-11883-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.

4 participants