Fix cancellation of subscriptions to work correctly. #28569
Merged
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
When a subscription came in with KeepSubscriptions set to false, we would just directly delete the ReadHandlers for the subscriptions not being kept, instead of calling Close(). That meant we skipped deleting subscription persistence data, and also failed to correcly update the reporting engine's round-robin reporting state, which could lead to subscriptions not being serviced fairly. The fix is to just call Close() just like we do for out-of-resource eviction, instead of manually deleting the object.
pullapprove
bot
requested review from
andy31415,
andyg-apple,
anush-apple,
arkq,
carol-apple,
cecille,
chrisdecenzo,
chshu,
chulspro,
cliffamzn,
Damian-Nordic,
dhrishi,
electrocucaracha,
emargolis,
gjc13,
harsha-rajendran,
hawk248,
hicklin,
jepenven-silabs,
jmartinez-silabs,
jmeg-sfy,
joonhaengHeo,
jtung-apple,
kkasperczyk-no,
ksperling-apple,
lazarkov,
lpbeliveau-silabs and
LuDuda
pullapprove
bot
requested review from
saurabhst,
selissia,
sharadb-amazon,
tecimovic,
tima-q,
tobiasgraf,
turon,
vivien-apple,
woody-apple,
younghak-hwang and
yufengwangca
|
PR #28569: Size comparison from 367a0c6 to bdded51 Increases (6 builds for cc32xx, psoc6, telink)
Decreases (45 builds for bl602, bl702, bl702l, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
Full report (58 builds for bl602, bl702, bl702l, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
yunhanw-google
approved these changes
Aug 8, 2023
There was a problem hiding this comment.
In original logic, assume we have not yet added persistent subscription logic, then we delete the readhandler from pool, the destructor would be called, it would call onReportConfirm if it is in IsAwaitingReportResponse so the report engine's state can be updated well. after applying your improvement, it would call close, and it move to AwaitingDestruction and reporting engine's state can be updated as well.
11:35
since we have added persistent subscription logic, we do need clear the persistent logic via explicit close call
just approve the pr, thanks
|
../../src/app/InteractionModelEngine.cpp -o obj/src/app/libCHIPDataModel.InteractionModelEngine.cpp.o this needs to be tested. |
|
can we have the job to enable CHIP_CONFIG_PERSIST_SUBSCRIPTIONS flag, and test the persistent subscription can be removed when closing the readhandler? |
No, it was still missing the |
I did test it, fwiw, on esp32 where I ran into the issue. It compiles there. ;) |
|
PR #28569: Size comparison from 367a0c6 to c625139 Increases (2 builds for linux, telink)
Decreases (52 builds for bl602, bl702, bl702l, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
Full report (60 builds for bl602, bl702, bl702l, cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
jtung-apple
approved these changes
Aug 8, 2023
bzbarsky-apple
added a commit
to bzbarsky-apple/connectedhomeip
that referenced
this pull request
Aug 8, 2023
) * Fix cancellation of subscriptions to work correctly. When a subscription came in with KeepSubscriptions set to false, we would just directly delete the ReadHandlers for the subscriptions not being kept, instead of calling Close(). That meant we skipped deleting subscription persistence data, and also failed to correcly update the reporting engine's round-robin reporting state, which could lead to subscriptions not being serviced fairly. The fix is to just call Close() just like we do for out-of-resource eviction, instead of manually deleting the object. * Fix build issue.
andy31415
pushed a commit
that referenced
this pull request
Aug 9, 2023
* Fix cancellation of subscriptions to work correctly. When a subscription came in with KeepSubscriptions set to false, we would just directly delete the ReadHandlers for the subscriptions not being kept, instead of calling Close(). That meant we skipped deleting subscription persistence data, and also failed to correcly update the reporting engine's round-robin reporting state, which could lead to subscriptions not being serviced fairly. The fix is to just call Close() just like we do for out-of-resource eviction, instead of manually deleting the object. * Fix build issue.
abpoth
pushed a commit
to abpoth/connectedhomeip
that referenced
this pull request
Aug 15, 2023
) * Fix cancellation of subscriptions to work correctly. When a subscription came in with KeepSubscriptions set to false, we would just directly delete the ReadHandlers for the subscriptions not being kept, instead of calling Close(). That meant we skipped deleting subscription persistence data, and also failed to correcly update the reporting engine's round-robin reporting state, which could lead to subscriptions not being serviced fairly. The fix is to just call Close() just like we do for out-of-resource eviction, instead of manually deleting the object. * Fix build issue.
maciejbaczmanski
pushed a commit
to maciejbaczmanski/connectedhomeip
that referenced
this pull request
Jul 15, 2024
…roject-chip#28569) * Fix cancellation of subscriptions to work correctly. When a subscription came in with KeepSubscriptions set to false, we would just directly delete the ReadHandlers for the subscriptions not being kept, instead of calling Close(). That meant we skipped deleting subscription persistence data, and also failed to correcly update the reporting engine's round-robin reporting state, which could lead to subscriptions not being serviced fairly. The fix is to just call Close() just like we do for out-of-resource eviction, instead of manually deleting the object. * Fix build issue.
maciejbaczmanski
pushed a commit
to maciejbaczmanski/connectedhomeip
that referenced
this pull request
Jul 15, 2024
…ectly. (project-chip#28569)" This reverts commit 5e90d7d.
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.
When a subscription came in with KeepSubscriptions set to false, we would just directly delete the ReadHandlers for the subscriptions not being kept, instead of calling Close().
That meant we skipped deleting subscription persistence data, and also failed to correcly update the reporting engine's round-robin reporting state, which could lead to subscriptions not being serviced fairly.
The fix is to just call Close() just like we do for out-of-resource eviction, instead of manually deleting the object.