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.

Sign up for GitHub

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

Jump to bottom

DAOS-16954 common: fix how the embedded value is deleted #15815

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

DAOS-16954 common: fix how the embedded value is deleted #15815

wants to merge 2 commits into from

Conversation

janekmi
Copy link
Contributor

@janekmi janekmi commented Jan 30, 2025 •
edited
Loading

When deleting the "root" record we cannot assume the tr_node offset points to a node since it can also point to an embedded value. So, we first have to consider the trace info or the tree flags to learn what the tree's "root" actually is.
This patch also introduced a few readability changes and a few pieces of in-source documentation.

Before requesting gatekeeper:

  • Two review approvals and any prior change requests have been resolved.
  • Testing is complete and all tests passed or there is a reason documented in the PR why it should be force landed and forced-landing tag is set.
  • Features: (or Test-tag*) commit pragma was used or there is a reason documented that there are no appropriate tags for this PR.
  • Commit messages follows the guidelines outlined here.
  • Any tests skipped by the ticket being addressed have been run and passed in the PR.

Gatekeeper:

  • You are the appropriate gatekeeper to be landing the patch.
  • The PR has 2 reviews by people familiar with the code, including appropriate owners.
  • Githooks were used. If not, request that user install them and check copyright dates.
  • Checkpatch issues are resolved. Pay particular attention to ones that will show up on future PRs.
  • All builds have passed. Check non-required builds for any new compiler warnings.
  • Sufficient testing is done. Check feature pragmas and test tags and that tests skipped for the ticket are run and now pass with the changes.
  • If applicable, the PR has addressed any potential version compatibility issues.
  • Check the target branch. If it is master branch, should the PR go to a feature branch? If it is a release branch, does it have merge approval in the JIRA ticket.
  • Extra checks if forced landing is requested
    • Review comments are sufficiently resolved, particularly by prior reviewers that requested changes.
    • No new NLT or valgrind warnings. Check the classic view.
    • Quick-build or Quick-functional is not used.
  • Fix the commit message upon landing. Check the standard here. Edit it to create a single commit. If necessary, ask submitter for a new summary.

janekmi and others added 2 commits January 29, 2025 16:51
@janekmi
DAOS-16954 common: fix how the embedded value is deleted
57c5db1 
Signed-off-by: Jan Michalski <[email protected]>
@janekmi @grom72
DAOS-16954 Fix the tree->embedded case + simplify the logic
1da33b9 
In the previous commit, I made a mistake when fixing the embedded value
case. Because it remained unnoticed, I think it is fair to say the current
`btr_root_del_rec()` logic is a little confusing. With this commit, I
hope to both fix my mistake and simplify the logic so this kind of
mistake won't happen in the future.

What is simplified:

- if it is an embedded value destroy it straight away,
- mostly restore the pre-embedded value logic without consideration for
  embedded values with one exception,
  - if the root is a leaf and there is more than one key remaining:
    - if there are exactly two keys and the embedded value is supported,
      the tree should be replaced with an embedded value.

Since both:
- deleting the embedded value and
- deleting the last key from a regular tree,
are the same a `btr_root_del_rec_last()` helper function has been
introduced.

Signed-off-by: Jan Michalski <[email protected]>
Co-authored-by: Tomasz Gromadzki <[email protected]>
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 30, 2025 •
edited
Loading

Ticket title is 'btree unit test SIGSEGV'
Status is 'In Progress'
https://daosio.atlassian.net/browse/DAOS-16954

@janekmi janekmi requested a review from jolivier23 January 30, 2025 18:31
@daosbuild1
Copy link
Collaborator

Test stage Unit Test bdev on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-15815/1/testReport/

@daosbuild1
Copy link
Collaborator

Test stage Unit Test bdev with memcheck on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-15815/1/testReport/

@daosbuild1
Copy link
Collaborator

Test stage Unit Test on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-15815/1/testReport/

@daosbuild1
Copy link
Collaborator

Test stage Unit Test with memcheck on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-15815/1/testReport/

jolivier23
jolivier23 previously approved these changes Jan 30, 2025
View reviewed changes
@janekmi janekmi marked this pull request as ready for review February 3, 2025 10:58
@janekmi janekmi requested review from a team as code owners February 3, 2025 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jolivier23 jolivier23 jolivier23 approved these changes

@NiuYawei NiuYawei Awaiting requested review from NiuYawei

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@janekmi @daosbuild1 @jolivier23