Delete persisted subscriptions that are in subscription resumption state when a subscribeRequest command comes in with keepSubscription flag set to false from the same subscriber #37741
Conversation
This file contains 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
|
Review changes with |
dvdm-qorvo
force-pushed
the
stop_subscription_resumption_after_resubscription
branch
from
7c120c8 to
bb7a421
Compare
|
PR #37741: Size comparison from 43a8a9b to bb7a421 Full report (45 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, nrfconnect, psoc6, qpg, stm32, telink, tizen)
|
…ate when a subscribeRequest command comes in with keepSubscription flag set to false from the same subscriber The Matter specification is saying: "If KeepSubscriptions is FALSE, all existing or pending subscriptions on the publisher for this subscriber SHALL be terminated." Currently only active readHandlers and corresponding persisted subscription were removed. The subscriptions that were persisted and in subscription resumption mode, were kept in persistent storage, keeping the subscription resumption mechanism active, so pending subscriptions were not terminated. This fixes, when a subscribeRequest come in with keepSubscriptions flag set to false, these persisted non-active subscriptions can be deleted as well and the subscription resumption mechanism can be stopped if no other subscription were resuming.
dvdm-qorvo
force-pushed
the
stop_subscription_resumption_after_resubscription
branch
from
bb7a421 to
f0f5065
Compare
|
PR #37741: Size comparison from 43a8a9b to 98b785c Full report (73 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
jtung-apple
reviewed
Feb 24, 2025
jtung-apple
approved these changes
Feb 24, 2025
|
PR #37741: Size comparison from 43a8a9b to 4944ea3 Full report (73 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
bzbarsky-apple
approved these changes
Feb 25, 2025
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
|
/gemini review |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
The pull request effectively addresses the issue of terminating persisted subscriptions in the subscription resumption state. The added code is well-structured and includes appropriate logging. The changes also ensure that the subscription resumption mechanism is properly stopped when no subscriptions are resuming. Good job!
Summary of Findings
- Log message clarity: The log message could be improved for better clarity and consistency.
- Conditional compilation: The conditional compilation block could be simplified by combining the conditions.
Assessment
The pull request addresses a critical issue related to subscription termination in the Matter protocol. The changes ensure that both active and non-active subscriptions are terminated when a subscribeRequest command with the keepSubscriptions flag set to false is received. The added code includes necessary checks and deletions of persisted subscriptions, along with adjustments to the subscription resumption mechanism. Overall, the changes seem well-implemented and effectively resolve the identified issue. I would recommend addressing the comments before requesting a review from someone else, but feel free to request another review from Gemini via /gemini review when you have addressed these comments and I'll take another look! Note that I am not authorized to directly approve the pull request, and users should have others review and approve this code before merging.
andy31415
approved these changes
Feb 26, 2025
|
It is a bit annoying that we are not able to unit test this ... we are adding tests that are only verifiable manually and in probably somewhat more complex conditions. Without unit tests we cannot ensure that things do not regress back after some other changes. |
gmarcosb
pushed a commit
to gmarcosb/connectedhomeip
that referenced
this pull request
Mar 4, 2025
…ate when a subscribeRequest command comes in with keepSubscription flag set to false from the same subscriber (project-chip#37741) * Delete persisted subscriptions that are in subscription resumption state when a subscribeRequest command comes in with keepSubscription flag set to false from the same subscriber The Matter specification is saying: "If KeepSubscriptions is FALSE, all existing or pending subscriptions on the publisher for this subscriber SHALL be terminated." Currently only active readHandlers and corresponding persisted subscription were removed. The subscriptions that were persisted and in subscription resumption mode, were kept in persistent storage, keeping the subscription resumption mechanism active, so pending subscriptions were not terminated. This fixes, when a subscribeRequest come in with keepSubscriptions flag set to false, these persisted non-active subscriptions can be deleted as well and the subscription resumption mechanism can be stopped if no other subscription were resuming. * Restyled by whitespace * Restyled by clang-format * Added mSubscriptionId value as part of the log line * Restyled by whitespace * Restyled by clang-format * Update comment in src/app/InteractionModelEngine.cpp Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> --------- Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #37739
The Matter specification is saying:
"If KeepSubscriptions is FALSE, all existing or pending subscriptions on the publisher for this subscriber SHALL be terminated."
Currently only active readHandlers and corresponding persisted subscription were removed. The subscriptions that were persisted and in subscription resumption mode, were kept in persistent storage, keeping the subscription resumption mechanism active, so pending subscriptions were not terminated. This fixes, when a subscribeRequest come in with keepSubscriptions flag set to false, these persisted non-active subscriptions can be deleted as well and the subscription resumption mechanism can be stopped if no other subscription were resuming.
Testing
Verified with QPG switch device based on the instructions listed in #37739