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.

Sign up for GitHub

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

Jump to bottom

Add parallel callback test #1044

Merged
merged 4 commits into from
Dec 2, 2022
Merged

Add parallel callback test #1044

merged 4 commits into from
Dec 2, 2022

Conversation

Flova
Copy link
Contributor

@Flova Flova commented Nov 18, 2022

Following up on the suggestion in #1039, this pull request adds a test case which checks if the parallel processing of callback is working when the reentrant callback group and the multithreaded executor are used. This behavior was broken recently, and the test should ensure that future regressions are noticed.

The test case is based on the reproduction example from #1039. I put it together with the callback group test cases, but we could put it somewhere else.

@Flova
Copy link
Contributor Author

Flova commented Nov 18, 2022

@fujitatomoya ping :)

@Flova
Add parallel callback test
d2d1928 
Signed-off-by: Florian Vahl <florian@flova.de>
@Flova Flova force-pushed the add_reentrant_group_blocking_test branch from f8ac216 to d2d1928 Compare November 18, 2022 10:29
@Flova
Fix typos
c713901 
Signed-off-by: Florian Vahl <florian@flova.de>
@fujitatomoya fujitatomoya self-assigned this Nov 29, 2022
fujitatomoya
fujitatomoya approved these changes Nov 29, 2022
View reviewed changes
Copy link
Collaborator

@fujitatomoya fujitatomoya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overall lgtm, a couple of minor comments.

rclpy/test/test_callback_group.py Outdated Show resolved Hide resolved
rclpy/test/test_callback_group.py Outdated Show resolved Hide resolved
@fujitatomoya
Copy link
Collaborator

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@Flova
Fix typo
ff4a53e 
Signed-off-by: Florian Vahl <florian@flova.de>
@Flova Flova force-pushed the add_reentrant_group_blocking_test branch from f109a1e to ff4a53e Compare November 29, 2022 15:28
@Flova
Use 2 workers threads, so that a machine with only one core also pass…
f2486cf 
…es the test.

Signed-off-by: Florian Vahl <florian@flova.de>
@Flova
Copy link
Contributor Author

Flova commented Nov 29, 2022

@fujitatomoya I added your suggestions.

@fujitatomoya
Copy link
Collaborator

@adityapande-1995 can you review this?

@adityapande-1995 adityapande-1995 merged commit 40054ba into ros2:rolling Dec 2, 2022
@Flova Flova deleted the add_reentrant_group_blocking_test branch December 2, 2022 09:32
@fujitatomoya
Copy link
Collaborator

@Mergifyio backport to humble

mergify bot pushed a commit that referenced this pull request Dec 2, 2022
@Flova @mergify
Add parallel callback test (#1044)
649639e 
* Add parallel callback test
Signed-off-by: Florian Vahl <florian@flova.de>
(cherry picked from commit 40054ba)
@mergify mergify bot mentioned this pull request Dec 2, 2022
Merged
@mergify
Copy link

mergify bot commented Dec 2, 2022

backport to humble

✅ Backports have been created

fujitatomoya pushed a commit that referenced this pull request Dec 22, 2022
@mergify @Flova
Add parallel callback test (#1044) (#1052)
d7346f5 
* Add parallel callback test
Signed-off-by: Florian Vahl <florian@flova.de>
(cherry picked from commit 40054ba)

Co-authored-by: Florian Vahl <florian@flova.de>
@fujitatomoya fujitatomoya mentioned this pull request Jan 31, 2023
Merged
iuhilnehc-ynos pushed a commit to iuhilnehc-ynos/rclpy that referenced this pull request Apr 10, 2023
@mergify @Flova
Add parallel callback test (ros2#1044) (ros2#1052)
3d6c7fc 
* Add parallel callback test
Signed-off-by: Florian Vahl <florian@flova.de>
(cherry picked from commit 40054ba)

Co-authored-by: Florian Vahl <florian@flova.de>
Signed-off-by: Chen Lihui <lihui.chen@sony.com>
iuhilnehc-ynos pushed a commit to iuhilnehc-ynos/rclpy that referenced this pull request Apr 10, 2023
@mergify @Flova
Add parallel callback test (ros2#1044) (ros2#1052)
5c15512 
* Add parallel callback test
Signed-off-by: Florian Vahl <florian@flova.de>
(cherry picked from commit 40054ba)

Co-authored-by: Florian Vahl <florian@flova.de>
Signed-off-by: Chen Lihui <lihui.chen@sony.com>
iuhilnehc-ynos pushed a commit to iuhilnehc-ynos/rclpy that referenced this pull request Apr 10, 2023
@mergify @Flova
Add parallel callback test (ros2#1044) (ros2#1052)
560fa7c 
* Add parallel callback test
Signed-off-by: Florian Vahl <florian@flova.de>
(cherry picked from commit 40054ba)

Co-authored-by: Florian Vahl <florian@flova.de>
Signed-off-by: Chen Lihui <lihui.chen@sony.com>
Barry-Xu-2018 pushed a commit to Barry-Xu-2018/rclpy that referenced this pull request Apr 10, 2023
@mergify @Flova @Barry-Xu-2018
Add parallel callback test (ros2#1044) (ros2#1052)
0706daa 
* Add parallel callback test
Signed-off-by: Florian Vahl <florian@flova.de>
(cherry picked from commit 40054ba)

Co-authored-by: Florian Vahl <florian@flova.de>
Signed-off-by: Barry Xu <barry.xu@sony.com>
fujitatomoya added a commit that referenced this pull request Apr 12, 2023
@Barry-Xu-2018 @mergify
@Flova @fujitatomoya @audrow @Crola1702 @Achllle
Rebase humble/pr-1033 (#1107)
1fa2d19 
* Add parallel callback test (#1044) (#1052)

* Add parallel callback test
Signed-off-by: Florian Vahl <florian@flova.de>
(cherry picked from commit 40054ba)

Co-authored-by: Florian Vahl <florian@flova.de>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* decorator should not be callable. (#1050) (#1051)

#1047

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 2da35a4)

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* 3.3.6

Signed-off-by: Audrow Nash <audrow@openrobotics.org>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* Fix `test_publisher` linter for pydocstyle 6.2.2 (backport #1063) (#1066)

Co-authored-by: Cristóbal Arroyo <69475004+Crola1702@users.noreply.github.com>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* 3.3.7

Signed-off-by: Audrow Nash <audrow@openrobotics.org>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* Fix #983 by saving future and checking for + raising any exceptions (#1073) (#1088)

* Fix #983 by saving future and checking for + raising any exceptions

Signed-off-by: Achille Verheye <achille.verheye@gmail.com>
Co-authored-by: Achille Verheye <achille.verheye@gmail.com>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* Deal with ParameterUninitializedException for parameter service (#1033)

* Deal with ParameterUninitializedException for parameter service

Signed-off-by: Barry Xu <barry.xu@sony.com>

* Enable all tests in test_parameter_client.py

Signed-off-by: Barry Xu <barry.xu@sony.com>

* Get empty value for ParameterUninitializedException

Signed-off-by: Barry Xu <barry.xu@sony.com>

Signed-off-by: Barry Xu <barry.xu@sony.com>
(cherry picked from commit e442ad2)

# Conflicts:
#	rclpy/test/test_parameter_client.py
Signed-off-by: Barry Xu <barry.xu@sony.com>

* Fix conflict and use new testcase (#1053)

Signed-off-by: Barry Xu <barry.xu@sony.com>

* Changed for filename with alphabet order

Signed-off-by: Barry Xu <barry.xu@sony.com>

---------

Signed-off-by: Barry Xu <barry.xu@sony.com>
Signed-off-by: Audrow Nash <audrow@openrobotics.org>
Signed-off-by: Achille Verheye <achille.verheye@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Florian Vahl <florian@flova.de>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Audrow Nash <audrow@openrobotics.org>
Co-authored-by: Cristóbal Arroyo <69475004+Crola1702@users.noreply.github.com>
Co-authored-by: Achille Verheye <achille.verheye@gmail.com>
fujitatomoya added a commit that referenced this pull request Apr 21, 2023
@Barry-Xu-2018 @mergify
@Flova @fujitatomoya @audrow @Crola1702 @Achllle
Rebase humble/pr-1033 (#1107)
729ebee 
* Add parallel callback test (#1044) (#1052)

* Add parallel callback test
Signed-off-by: Florian Vahl <florian@flova.de>
(cherry picked from commit 40054ba)

Co-authored-by: Florian Vahl <florian@flova.de>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* decorator should not be callable. (#1050) (#1051)

#1047

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>

Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
(cherry picked from commit 2da35a4)

Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* 3.3.6

Signed-off-by: Audrow Nash <audrow@openrobotics.org>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* Fix `test_publisher` linter for pydocstyle 6.2.2 (backport #1063) (#1066)

Co-authored-by: Cristóbal Arroyo <69475004+Crola1702@users.noreply.github.com>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* 3.3.7

Signed-off-by: Audrow Nash <audrow@openrobotics.org>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* Fix #983 by saving future and checking for + raising any exceptions (#1073) (#1088)

* Fix #983 by saving future and checking for + raising any exceptions

Signed-off-by: Achille Verheye <achille.verheye@gmail.com>
Co-authored-by: Achille Verheye <achille.verheye@gmail.com>
Signed-off-by: Barry Xu <barry.xu@sony.com>

* Deal with ParameterUninitializedException for parameter service (#1033)

* Deal with ParameterUninitializedException for parameter service

Signed-off-by: Barry Xu <barry.xu@sony.com>

* Enable all tests in test_parameter_client.py

Signed-off-by: Barry Xu <barry.xu@sony.com>

* Get empty value for ParameterUninitializedException

Signed-off-by: Barry Xu <barry.xu@sony.com>

Signed-off-by: Barry Xu <barry.xu@sony.com>
(cherry picked from commit e442ad2)

# Conflicts:
#	rclpy/test/test_parameter_client.py
Signed-off-by: Barry Xu <barry.xu@sony.com>

* Fix conflict and use new testcase (#1053)

Signed-off-by: Barry Xu <barry.xu@sony.com>

* Changed for filename with alphabet order

Signed-off-by: Barry Xu <barry.xu@sony.com>

---------

Signed-off-by: Barry Xu <barry.xu@sony.com>
Signed-off-by: Audrow Nash <audrow@openrobotics.org>
Signed-off-by: Achille Verheye <achille.verheye@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Florian Vahl <florian@flova.de>
Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
Co-authored-by: Audrow Nash <audrow@openrobotics.org>
Co-authored-by: Cristóbal Arroyo <69475004+Crola1702@users.noreply.github.com>
Co-authored-by: Achille Verheye <achille.verheye@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adityapande-1995 adityapande-1995 adityapande-1995 approved these changes

@fujitatomoya fujitatomoya fujitatomoya approved these changes

@sloretz sloretz Awaiting requested review from sloretz sloretz is a code owner

Assignees

@fujitatomoya fujitatomoya

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Flova @fujitatomoya @adityapande-1995