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

Cherry-pick changes from upstream #565

Merged

Conversation

adigie
Copy link
Member

@adigie adigie commented Mar 3, 2025

  • Clean up partial fabric data after device is reset during CommitPendingFabricData
  • Fix method naming and cleanup FailSafeContext

adigie added 2 commits March 3, 2025 13:19
* Rename FailSafeCommitMarkerKey to FabricTableCommitMarkerKey

Commit marker was moved from FailSafeContext to FabricTable in #20010,
however name of the key wasn't changed and it's misleading.

This commit changes the name of the method returning commit marker key,
but keeps the key name for backward compatibility.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

* Remove declaration of non-existent method

CommitToStorage was removed in #20010.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

---------

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
(cherry picked from commit 4c7bbe0e1182acfeddfc2194ca2250c23f74bbda)
…ing CommitPendingFabricData (#37819)

* Always clean up all data in FabricTable::Delete

Always try to cleanup all fabric data regardless if fabric was
initialized, as there may be some partial data stored if a device was
reset during committing changes to storage.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

* Test FabricTable Delete

Test if Delete invokes delegates, as this is needed to cleanup all
fabric related settings after device is reset during committing changes
to storage.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

* Fix test

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

* Fix return value

Make Delete return the same errors as before the changes.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

---------

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
(cherry picked from commit e95b91368ad52de36eda2e25282a00a7d74620dc)
@maciejbaczmanski maciejbaczmanski merged commit eea6cc4 into nrfconnect:master Mar 3, 2025
9 checks passed
@adigie adigie deleted the fromtree/fail-safe-delete branch March 3, 2025 14:52
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.

3 participants