Fix JointFabricDatastore ownership, lifetime, and sync edge cases#71453
Open
vijs wants to merge 1 commit intoproject-chip:masterfrom
Open
Fix JointFabricDatastore ownership, lifetime, and sync edge cases#71453vijs wants to merge 1 commit intoproject-chip:masterfrom
vijs wants to merge 1 commit intoproject-chip:masterfrom
Conversation
github-actions
bot
added
documentation
pullapprove
bot
added
review - pending
and removed
documentation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request introduces significant enhancements to the Joint Fabric Datastore and synchronization logic, including support for 'regular' device commissioning, improved in-flight command management, and more robust handling of ACL and Group Key Set data. The changes also include a major refactor of the unit tests to use a more descriptive tracking delegate. Key feedback items include critical safety concerns regarding iterator invalidation in asynchronous callbacks within JointFabricDatastore.cpp, misleading variable names in JFADatastoreSync.cpp, and inconsistent error status codes when resources are not found.
| keySetWrite.groupKeySet.epochKey2 = cbContext->objectToWrite.Value().epochKey2; | ||
| keySetWrite.groupKeySet.epochStartTime2 = cbContext->objectToWrite.Value().epochStartTime2; | ||
|
|
||
| chip::Controller::ClusterBase groupsCluster(exchangeMgr, sessionHandle, kRootEndpointId); |
Contributor
There was a problem hiding this comment.
The variable name groupsCluster is misleading here as it is being used to interact with the GroupKeyManagement cluster. Consider renaming it to groupKeyMgmtCluster.
chip::Controller::ClusterBase groupKeyMgmtCluster(exchangeMgr, sessionHandle, kRootEndpointId);
|
PR #71453: Size comparison from ad11a88 to cebf5f1 Full report (34 builds for bl602, bl616, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #71453 +/- ##
==========================================
- Coverage 54.31% 54.27% -0.05%
==========================================
Files 1576 1576
Lines 108247 108317 +70
Branches 13401 13428 +27
==========================================
- Hits 58796 58784 -12
- Misses 49451 49533 +82 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
andy31415
reviewed
Apr 8, 2026
|
|
||
| uint64_t JointFabricDatastore::GetEndpointStorageKey(NodeId nodeId, EndpointId endpointId) const | ||
| { | ||
| return (static_cast<uint64_t>(nodeId) << 16) | static_cast<uint64_t>(endpointId); |
Contributor
There was a problem hiding this comment.
NodeId is 64-bit already, so this loses the upper 16-bits.
We need a comment on why this is safe (I do not believe it is ...)
Contributor
There was a problem hiding this comment.
also the static cast for nodeID is then not needed (otherwise it makes it seem like we upcast, but we do not)
Contributor
Author
There was a problem hiding this comment.
Simplified this logic to remove all casts and conversions. Please review the updated implementation.
github-actions
bot
added
documentation
|
PR #71453: Size comparison from 17a6004 to e03244d Full report (34 builds for bl602, bl616, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
|
PR #71453: Size comparison from d86a220 to 58264e2 Full report (34 builds for bl602, bl616, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Improves JointFabric Datastore memory safety and reliability by fixing ownership and lifetime bugs, tightening refresh and sync edge cases, and adding targeted unit tests to prevent regressions.
Changes
Testing