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.

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

Improve handling of discovery - RCL changes. Extends #1023 #1038

Merged

Conversation

arjo129
Copy link
Collaborator

@arjo129 arjo129 commented Mar 2, 2023

arjo129 added a commit to arjo129/rmw_fastrtps that referenced this pull request Mar 2, 2023
See:
* ros2/rmw#349
* ros2/rcl#1038

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
@wjwwood wjwwood changed the base branch from rolling to gbiggs/discovery-peers-specification March 21, 2023 18:53
@wjwwood wjwwood force-pushed the gbiggs/discovery-peers-specification branch from 731106f to 4529112 Compare March 21, 2023 19:59
mxgrey and others added 5 commits March 21, 2023 13:00
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
This commit adds support for dynamic allocation for unlimited number of
static peers.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
set.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
@wjwwood wjwwood marked this pull request as ready for review March 21, 2023 20:00
@wjwwood
Copy link
Member

wjwwood commented Mar 21, 2023

Merging into #1023

@wjwwood wjwwood merged commit 5225a54 into ros2:gbiggs/discovery-peers-specification Mar 21, 2023
1 check passed
wjwwood pushed a commit to arjo129/rmw_fastrtps that referenced this pull request Mar 21, 2023
See:
* ros2/rmw#349
* ros2/rcl#1038

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
wjwwood pushed a commit to ros2/rmw_fastrtps that referenced this pull request Mar 21, 2023
See:
* ros2/rmw#349
* ros2/rcl#1038

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
sloretz added a commit to ros2/rmw_fastrtps that referenced this pull request Apr 8, 2023
* Support specification of discovery range and static peers

Signed-off-by: Geoffrey Biggs <gbiggs@killbots.net>

* Apply suggestions from eProsima

Signed-off-by: Geoffrey Biggs <gbiggs@killbots.net>

* Use participant ignoring

Signed-off-by: Geoffrey Biggs <gbiggs@killbots.net>

* Improve handling of aliases for hosts

Signed-off-by: Geoffrey Biggs <gbiggs@killbots.net>

* Adds support for using IP addresses to specify peers

This commit adds support for using IP addresses to specify peers. It
also refactors out some networking function so that they can be used by
other files.

Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>

* Remove excessive logging

Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>

* Add name lookup and clean up implementation.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Two more scenarios fixed.

Two more to go.

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Revert rmw changes

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Add support for dynamic allocations

See:
* ros2/rmw#349
* ros2/rcl#1038

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Support new requirements

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>

* Update to latest rmw API

Signed-off-by: Michael X. Grey <grey@openrobotics.org>

* Update to use API on Fast-DDS master

Signed-off-by: Shane Loretz <sloretz@google.com>

* Update with rmw_discovery_options_t changes

Signed-off-by: Shane Loretz <sloretz@google.com>

* Minimize diff with rolling in custom_participant_info.hpp

Signed-off-by: Shane Loretz <sloretz@google.com>

* Minimize diff with rolling in participant.cpp

Signed-off-by: Shane Loretz <sloretz@google.com>

* Collapse lines

Signed-off-by: Shane Loretz <sloretz@google.com>

* conditional on one line

Signed-off-by: Shane Loretz <sloretz@google.com>

* return instead of setting variable

Signed-off-by: Shane Loretz <sloretz@google.com>

* Make log messages more informative

Signed-off-by: Shane Loretz <sloretz@google.com>

* Works without ignore participant change!

Signed-off-by: Shane Loretz <sloretz@google.com>

* Remove unused code

Signed-off-by: Shane Loretz <sloretz@google.com>

* Remove more unused code

Signed-off-by: Shane Loretz <sloretz@google.com>

* Minimize diff with rolling

Signed-off-by: Shane Loretz <sloretz@google.com>

* NOT_SET and SYSTEM_DEFAULT values

Signed-off-by: Shane Loretz <sloretz@google.com>

* OFF implementation that doesn't crash

Signed-off-by: Shane Loretz <sloretz@google.com>

* Set discovery range in test

Signed-off-by: Shane Loretz <sloretz@google.com>

* Lint

Signed-off-by: Shane Loretz <sloretz@google.com>

* Call rmw_discovery_options_init()

Signed-off-by: Shane Loretz <sloretz@google.com>

* Workaround deadlock with rclcpp global logging mutex

Signed-off-by: Shane Loretz <sloretz@google.com>

* Add shared memory transport for LOCALHOST traffic

Signed-off-by: Shane Loretz <sloretz@google.com>

* Configure max initial peers range on udp transport

Signed-off-by: Shane Loretz <sloretz@google.com>

* Disable built-in transports and fix lint

Signed-off-by: Shane Loretz <sloretz@google.com>

* Error when range is an invalid value

Signed-off-by: Shane Loretz <sloretz@google.com>

* undo unnecessary test change

Signed-off-by: Shane Loretz <sloretz@google.com>

* Document Setting range to SYSTEM_DEFAULT

Signed-off-by: Shane Loretz <sloretz@google.com>

* Limit participants to 1 when discover is OFF

Signed-off-by: Shane Loretz <sloretz@google.com>

* With SUBNET and initial peers, add default multicast address as a multicast locator

Signed-off-by: Shane Loretz <sloretz@google.com>

* Add multicast address to initial peer list when there are other static peers and SUBNET range

Signed-off-by: Shane Loretz <sloretz@google.com>

* Bump required Fast-DDS version to 2.10

Signed-off-by: Shane Loretz <sloretz@google.com>

* Set maxInitialPeersRange to 32

Signed-off-by: Shane Loretz <sloretz@google.com>

* Grammar

Signed-off-by: Shane Loretz <sloretz@google.com>

* Shorten sentence

Signed-off-by: Shane Loretz <sloretz@google.com>

---------

Signed-off-by: Geoffrey Biggs <gbiggs@killbots.net>
Signed-off-by: Arjo Chakravarty <arjo@openrobotics.org>
Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Signed-off-by: Michael X. Grey <grey@openrobotics.org>
Signed-off-by: Shane Loretz <sloretz@google.com>
Co-authored-by: Arjo Chakravarty <arjo@openrobotics.org>
Co-authored-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Co-authored-by: Michael X. Grey <grey@openrobotics.org>
Co-authored-by: Shane Loretz <sloretz@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants