Add missing endWork calls in MTRClusters. #23659
Merged
+687
−153
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
We were missing endWork bits for command invokes when the command has a data (not status) response. This would end up permanently blocking the MTRDevice's work queue once such a command (e.g. UpdateFabricLabel) was issued. The changes here are as follows: 1) Rearrange the logic in MTRClusters-src.zapt so that the endWork happens regardless of whether hasSpecificResponse is true. 2) Add a deprecation message to the timedInvokeTimeoutMs field in _response_ command params, since that should never be used (ran into this when writing the tests for this PR). 3) Set resubscribeIfLost to NO on various subscriptions in MTRDeviceTests, so if another test takes a while we don't fail due to the canceled subscriptions re-subscribing and over-fullfilling the subscription expectations. 4) Add a test for a mix of passing and failing commands on MTRCluster instances, with some of the commands defined as getting status-only responses and some defined as getting data responses. This test fails without the endWork fix.
pullapprove
bot
requested review from
andy31415,
anush-apple,
arkq,
Byungjoo-Lee,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
Damian-Nordic,
dhrishi,
electrocucaracha,
emargolis,
franck-apple,
gjc13,
harsha-rajendran,
hawk248,
isiu-apple,
jelderton,
jepenven-silabs,
jmartinez-silabs,
jtung-apple,
lazarkov,
LuDuda,
mlepage-google,
mrjerryjohns,
msandstedt,
mspang and
robszewczyk
pullapprove
bot
requested review from
saurabhst,
selissia,
tcarmelveilleux,
tecimovic,
tehampson,
turon,
vijs,
vivien-apple,
wbschiller,
woody-apple,
xylophone21 and
yunhanw-google
carol-apple
approved these changes
Nov 17, 2022
|
PR #23659: Size comparison from 80f7dcd to 203640c Increases (7 builds for bl602, cc13x2_26x2, nrfconnect, psoc6, telink)
Decreases (7 builds for bl602, bl702, cc13x2_26x2, esp32, psoc6, telink)
Full report (51 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
|
|
Fast-tracking platform-specific change with platform owner review. |
yufengwangca
approved these changes
Nov 17, 2022
jtung-apple
approved these changes
Nov 17, 2022
adbridge
pushed a commit
to ARM-software/connectedhomeip
that referenced
this pull request
Nov 18, 2022
We were missing endWork bits for command invokes when the command has a data (not status) response. This would end up permanently blocking the MTRDevice's work queue once such a command (e.g. UpdateFabricLabel) was issued. The changes here are as follows: 1) Rearrange the logic in MTRClusters-src.zapt so that the endWork happens regardless of whether hasSpecificResponse is true. 2) Add a deprecation message to the timedInvokeTimeoutMs field in _response_ command params, since that should never be used (ran into this when writing the tests for this PR). 3) Set resubscribeIfLost to NO on various subscriptions in MTRDeviceTests, so if another test takes a while we don't fail due to the canceled subscriptions re-subscribing and over-fullfilling the subscription expectations. 4) Add a test for a mix of passing and failing commands on MTRCluster instances, with some of the commands defined as getting status-only responses and some defined as getting data responses. This test fails without the endWork fix.
adbridge
pushed a commit
to ARM-software/connectedhomeip
that referenced
this pull request
Nov 18, 2022
We were missing endWork bits for command invokes when the command has a data (not status) response. This would end up permanently blocking the MTRDevice's work queue once such a command (e.g. UpdateFabricLabel) was issued. The changes here are as follows: 1) Rearrange the logic in MTRClusters-src.zapt so that the endWork happens regardless of whether hasSpecificResponse is true. 2) Add a deprecation message to the timedInvokeTimeoutMs field in _response_ command params, since that should never be used (ran into this when writing the tests for this PR). 3) Set resubscribeIfLost to NO on various subscriptions in MTRDeviceTests, so if another test takes a while we don't fail due to the canceled subscriptions re-subscribing and over-fullfilling the subscription expectations. 4) Add a test for a mix of passing and failing commands on MTRCluster instances, with some of the commands defined as getting status-only responses and some defined as getting data responses. This test fails without the endWork fix.
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.
We were missing endWork bits for command invokes when the command has a data (not status) response. This would end up permanently blocking the MTRDevice's work queue once such a command (e.g. UpdateFabricLabel) was issued.
The changes here are as follows:
regardless of whether hasSpecificResponse is true.
command params, since that should never be used (ran into this when writing
the tests for this PR).
another test takes a while we don't fail due to the canceled subscriptions
re-subscribing and over-fullfilling the subscription expectations.
with some of the commands defined as getting status-only responses and some
defined as getting data responses. This test fails without the endWork fix.