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

FEATURE-13448: add use compound file setting #13478

Conversation

sam-herman
Copy link
Contributor

@sam-herman sam-herman commented Apr 30, 2024

Description

Add useCompoundFile setting for the engine

Related Issues

Resolves #13448

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.

@github-actions github-actions bot added enhancement Enhancement or improvement to existing feature or request Indexing Indexing, Bulk Indexing and anything related to indexing labels Apr 30, 2024
Copy link
Contributor

❌ Gradle check result for 51fa0eb: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@andrross
Copy link
Member

andrross commented May 1, 2024

Please add an entry to the CHANGELOG for this new setting

@andrross
Copy link
Member

andrross commented May 1, 2024

❌ Gradle check result for 51fa0eb: FAILURE

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':server:spotlessJavaCheck'.
> The following files had format violations:
      src/main/java/org/opensearch/index/engine/EngineConfig.java
          @@ -159,8 +159,6 @@
           ········}
           ····},·Property.IndexScope,·Property.NodeScope);
           
          -
          -
           ····/**
           ·····*·Index·setting·to·change·the·compression·level·of·zstd·and·zstd_no_dict·lucene·codecs.
           ·····*·Compression·Level·gives·a·trade-off·between·compression·ratio·and·speed.·The·higher·compression·level·results·in·higher·compression·ratio·but·slower·compression·and·decompression·speeds.
      src/test/java/org/opensearch/index/engine/InternalEngineTests.java
          @@ -369,10 +369,7 @@
           ····public·void·testSegmentsWithUseCompoundFileFlag_false()·throws·IOException·{
           ········final·IndexSettings·indexSettings·=·IndexSettingsModule.newIndexSettings(
           ············"test",
          -············Settings.builder()
          -················.put(defaultSettings.getSettings())
          -················.put(EngineConfig.INDEX_USE_COMPOUND_FILE.getKey(),·false)
          -················.build()
          +············Settings.builder().put(defaultSettings.getSettings()).put(EngineConfig.INDEX_USE_COMPOUND_FILE.getKey(),·false).build()
           ········);
           ········try·(Store·store·=·createStore();·Engine·engine·=·createEngine(indexSettings,·store,·createTempDir(),·new·TieredMergePolicy()))·{
           ············ParsedDocument·doc·=·testParsedDocument("1",·null,·testDocument(),·B_1,·null);
  Run './gradlew :server:spotlessApply' to fix these violations.

@sam-herman
Copy link
Contributor Author

@andrross thank you for the feedback, I made the requested changes. Let me know if that is inline.

@sam-herman sam-herman requested a review from andrross May 1, 2024 21:42
Copy link
Contributor

github-actions bot commented May 1, 2024

❌ Gradle check result for d651617: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@andrross andrross added the backport 2.x Backport to 2.x branch label May 2, 2024
@andrross
Copy link
Member

andrross commented May 2, 2024

@samuel-oci Can you rebase this PR? A version bump happened on the 2.x branch for the upcoming release and I think that has broken the bwc tests.

Signed-off-by: Samuel Herman <[email protected]>
Signed-off-by: Samuel Herman <[email protected]>
@sam-herman sam-herman force-pushed the FEATURE-13448/add_use_compound_file_setting branch from d651617 to 40360aa Compare May 3, 2024 00:38
@sam-herman
Copy link
Contributor Author

@samuel-oci Can you rebase this PR? A version bump happened on the 2.x branch for the upcoming release and I think that has broken the bwc tests.

@andrross done

Copy link
Contributor

github-actions bot commented May 3, 2024

✅ Gradle check result for 40360aa: SUCCESS

Copy link

codecov bot commented May 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.50%. Comparing base (b15cb0c) to head (40360aa).
Report is 258 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13478      +/-   ##
============================================
+ Coverage     71.42%   71.50%   +0.08%     
- Complexity    59978    61024    +1046     
============================================
  Files          4985     5051      +66     
  Lines        282275   287003    +4728     
  Branches      40946    41582     +636     
============================================
+ Hits         201603   205230    +3627     
- Misses        63999    64814     +815     
- Partials      16673    16959     +286     

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

Copy link
Collaborator

@Bukhtawar Bukhtawar left a comment

Choose a reason for hiding this comment

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

LGTM, lets document the same

@andrross andrross merged commit 14cd0e3 into opensearch-project:main May 3, 2024
28 of 29 checks passed
@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:

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

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

andrross pushed a commit to andrross/OpenSearch that referenced this pull request May 8, 2024
* add use compound file setting

Signed-off-by: Samuel Herman <[email protected]>

* review feedback

Signed-off-by: Samuel Herman <[email protected]>

---------

Signed-off-by: Samuel Herman <[email protected]>
(cherry picked from commit 14cd0e3)
reta pushed a commit that referenced this pull request May 8, 2024
* add use compound file setting

Signed-off-by: Samuel Herman <[email protected]>

* review feedback

Signed-off-by: Samuel Herman <[email protected]>

---------

Signed-off-by: Samuel Herman <[email protected]>
(cherry picked from commit 14cd0e3)

Co-authored-by: samuel-oci <[email protected]>
finnegancarroll pushed a commit to finnegancarroll/OpenSearch that referenced this pull request May 10, 2024
* add use compound file setting

Signed-off-by: Samuel Herman <[email protected]>

* review feedback

Signed-off-by: Samuel Herman <[email protected]>

---------

Signed-off-by: Samuel Herman <[email protected]>
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request May 17, 2024
* add use compound file setting

Signed-off-by: Samuel Herman <[email protected]>

* review feedback

Signed-off-by: Samuel Herman <[email protected]>

---------

Signed-off-by: Samuel Herman <[email protected]>
parv0201 pushed a commit to parv0201/OpenSearch that referenced this pull request Jun 10, 2024
* add use compound file setting

Signed-off-by: Samuel Herman <[email protected]>

* review feedback

Signed-off-by: Samuel Herman <[email protected]>

---------

Signed-off-by: Samuel Herman <[email protected]>
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 backport-failed enhancement Enhancement or improvement to existing feature or request Indexing Indexing, Bulk Indexing and anything related to indexing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request] Create setting to disable CompoundFile usage
3 participants