Skip to content

common: stable-2.1 cherry-pick - #44

Merged
janekmi merged 3 commits into
masterfrom
janekmi/2.1-cherry-pick
Aug 5, 2026
Merged

common: stable-2.1 cherry-pick#44
janekmi merged 3 commits into
masterfrom
janekmi/2.1-cherry-pick

Conversation

@janekmi

@janekmi janekmi commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

This change is Reviewable

janekmi and others added 3 commits August 4, 2026 13:42
Ref: DAOS-18692
Ref: #1

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>
* DAOS-18882 pmdk: rebuild heap_curr_allocated from on-media state

rebuild heap_curr_allocated from on-media state if the counter has
underflowed.

Signed-off-by: Liang Zhen <gnailzenh@gmail.com>

* obj: recalculate curr_allocated on underflow

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

* obj: fix copyrights

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

* obj: remove redundant comment

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

* obj: add unit test

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

* obj: fix Copyright

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

* obj: improve underflow detectio and...

... move recalculation to the getter.

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>
Co-authored-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>

* obj: restore the warning message

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

* obj: remove redundant header

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

* obj: fixes + updated unit test

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

* obj: fix comments in the unit test

Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>

---------

Signed-off-by: Liang Zhen <gnailzenh@gmail.com>
Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>
Co-authored-by: Jan Michalski <jan-marian.michalski@hpe.com>
Co-authored-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>
Use compare-and-swap loop in STATS_INC/DEC_persistent to avoid overflow-underflow race.

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>
@janekmi
janekmi requested review from grom72 and osalyk August 4, 2026 13:48

@osalyk osalyk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:lgtm:

@osalyk reviewed 20 files and all commit messages, and made 1 comment.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on grom72).

@janekmi
janekmi merged commit 666c56b into master Aug 5, 2026
9 checks passed
@janekmi
janekmi deleted the janekmi/2.1-cherry-pick branch August 7, 2026 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants