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

Make DiscoveryServer servers' guid prefix optional #129

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Make DiscoveryServer servers' guid prefix optional #129

merged 3 commits into from
Sep 9, 2024

Conversation

juanlofer-eprosima
Copy link
Contributor

@juanlofer-eprosima juanlofer-eprosima commented Sep 5, 2024 •
edited
Loading

This PR:

  • Makes DiscoveryServer servers' guid prefix optional, as starting from Fast-DDS v3.0.0 release it is no longer required. Nonetheless, it's kept as an optional to allow for communication with clients using previous Fast-DDS versions (these clients need to point to a GUID, so it's necessary to fix one in the server side). Note that not setting a GUID solves a corner case when TCP localhost addresses are used: this is because Fast-DDS performs the transformation of (suitable) locators to localhost based on their associated GUID, which needs to convey certain rules. And so this mechanism only succeeds when the GUID is internally assigned by Fast-DDS instead of manually set by users.
  • Raises YAML reader version (given the previous change, and that discovery-server-guid is no longer present in DiscoveryServerConnectionAddress).

@juanlofer-eprosima
Make DiscoveryServer servers' guid prefix optional
3d13f2b 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@juanlofer-eprosima
Raise YAML reader version
2efb15a 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@juanlofer-eprosima
BONUS: improve participant discovery traces
1349ed4 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
LuciaEchevarria99
LuciaEchevarria99 approved these changes Sep 9, 2024
View reviewed changes
Copy link
Contributor

@LuciaEchevarria99 LuciaEchevarria99 left a comment

Choose a reason for hiding this comment

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

LGTM

@juanlofer-eprosima juanlofer-eprosima merged commit ea649d5 into integration/bump-3.0.0 Sep 9, 2024
6 of 17 checks passed
@juanlofer-eprosima juanlofer-eprosima deleted the feature/optional-guidprefix branch September 9, 2024 06:26
LuciaEchevarria99 pushed a commit that referenced this pull request Sep 10, 2024
@juanlofer-eprosima @LuciaEchevarria99
Make DiscoveryServer servers' guid prefix optional (#129)
5cce977 
* Make DiscoveryServer servers' guid prefix optional

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Raise YAML reader version

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* BONUS: improve participant discovery traces

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

---------

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
rsanchez15 pushed a commit that referenced this pull request Sep 10, 2024
@LuciaEchevarria99 @juanlofer-eprosima
Update repository for Fast DDS 3.0.0 compatibility (#111)
7fff9e9 
* Update repository for FastDDS 3.0.0 compatibility

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix tests and first approximation to change Dynamic Types

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix DynTypesParticipant::on_type_discovery_ callback to register type_name-type_id tuple and some other minor changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Change DynTypesParticipant to use RTPS Participant callbacks

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Regenarate types

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Add TypeIdentifiers to DdsTopic in order to pass the TypeInformation to RTPS Writer/Reader

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Apply suggested changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Apply suggested changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Regenerate types

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix compilation after rebase to fastdds master

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Continue rebasing to FastDDS master

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Change .h headers to .hpp and regenerate types

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Update repository with new changes in Fast DDS 3.x

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Remove DynamicType to IDL serialization from DDSPipe

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Delete public functions in PayloadPool inherited from IPayloadPool and add missing tests in CMake file

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Apply suggested changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Adjust to TopicDataType refactor and removal of WriterProxyData/ReaderProxyData from public API

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Update after refactor in Participant discovery information

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Update after TopicAttributes removal from public API

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Regenerate types

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix TopicDescription in CommonReader and CommonWriter

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Apply suggested changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Remove GuidPrefix attribute from DiscoveryServerConnectionAddress

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Remove is_keyed_ method after Publication/SubscriptionBuiltinTopicData update in Fast DDS

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix CacheChangePool after rebase

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix tests

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix uncrustify

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Free allocated memory in PayloadPool::release_

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fill TypeInformation in Topic Description just from complete TypeIdentifier in CommonWriter (already done in CommonReader)

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Apply suggested changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Make payload_owner=nullptr in PayloadPool::release_ before empty() to avoid assertion failure

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Add assertion making sure TypeIdentifier is complete before calling add_schema

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Apply suggested changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Refactor rtps participants reckon_participant_attributes_

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Accept v6 interfaces and interface names in whitelist (#128)

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Make DiscoveryServer servers' guid prefix optional (#129)

* Make DiscoveryServer servers' guid prefix optional

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Raise YAML reader version

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* BONUS: improve participant discovery traces

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

---------

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>

* Add missing suggested changes

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Correct type_kind_to_str output for TK_CHAR8 case

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Remove unnecessary CacheChange include

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Implement add_qos_properties_ in reckon_participant_qos_

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Remove Fast-DDS API ReturnCode explanation in PayloadPoolMediator::write

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Change name ip_configuration -> initial_peers_configuration

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Change name ds_configuration -> discovery_server_configuration

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Use dynamic_pointer_cast instead of static_pointer_cast in reckon_participant_attributes_

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Change function descriptions in CommonParticipant

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* CHange char sequence message in tests

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Add clarification comment in TopicDataType::compute_key(SerializedPayload_t, ...)

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix YamlGetEntityGuidPrefixTest.get_guidprefix_explicitly test

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Add comment clarifying the order of TypeIdentifiers (complete and minimal) in DdsTopic.type_identifiers

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix Windows compilation

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Uncrustify

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Check if ParticipantConfiguration is nullptr after cast in reckon_participant_attributes_

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

* Fix uncrustify

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>

---------

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
Co-authored-by: juanlofer-eprosima <88179026+juanlofer-eprosima@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LuciaEchevarria99 LuciaEchevarria99 LuciaEchevarria99 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@juanlofer-eprosima @LuciaEchevarria99