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

[19967] Define a super client by environment variable #4047

Merged
merged 9 commits into from
Dec 5, 2023
Merged

Conversation

elianalf
Copy link
Contributor

@elianalf elianalf commented Nov 23, 2023

Description

Define a super client setting a new environment variable ROS_SUPER_CLIENT

@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally; test case: [19967] Define a super client by environment variable Discovery-Server#65
  • Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • New feature has been documented/Current behavior is correctly described in the documentation.
    Related documentation PR: [19967] Define a super client by environment variable Fast-DDS-docs#596
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@elianalf elianalf added the doc-pending Issue or PR which is pending to be documented label Nov 23, 2023
@elianalf elianalf changed the title Feature/19967 [19967] Define a super client by environment variable Nov 23, 2023
@EduPonz EduPonz added this to the v2.13.0 milestone Nov 24, 2023
@EduPonz
Copy link

EduPonz commented Nov 24, 2023

@richiprosima please test mac

@EduPonz EduPonz added ci-pending PR which CI is running needs-review PR that is ready to be reviewed and removed doc-pending Issue or PR which is pending to be documented labels Nov 27, 2023
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

Please remove commit b0651d09484806986b63b72f231641ddd21373dc from the history

src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp Outdated Show resolved Hide resolved
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
@elianalf
Copy link
Contributor Author

@richiprosima please test this

@MiguelCompany MiguelCompany removed the needs-review PR that is ready to be reviewed label Nov 29, 2023
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

🏅

@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Nov 30, 2023
@MiguelCompany
Copy link
Member

@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x

Copy link
Contributor

mergify bot commented Nov 30, 2023

backport 2.12.x 2.11.x 2.10.x 2.6.x

✅ Backports have been created

@MiguelCompany
Copy link
Member

MiguelCompany commented Nov 30, 2023

Testing with discovery server changes:

Build Status

@MiguelCompany MiguelCompany added ci-pending PR which CI is running and removed ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. labels Nov 30, 2023
@elianalf
Copy link
Contributor Author

elianalf commented Dec 4, 2023

@richiprosima please test windows

1 similar comment
@EduPonz
Copy link

EduPonz commented Dec 5, 2023

@richiprosima please test windows

@EduPonz EduPonz merged commit f40d54c into master Dec 5, 2023
12 of 14 checks passed
@EduPonz EduPonz deleted the feature/19967 branch December 5, 2023 15:19
mergify bot pushed a commit that referenced this pull request Dec 5, 2023
* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)
mergify bot pushed a commit that referenced this pull request Dec 5, 2023
* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)
mergify bot pushed a commit that referenced this pull request Dec 5, 2023
* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)
mergify bot pushed a commit that referenced this pull request Dec 5, 2023
* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp
#	test/unittest/dds/participant/ParticipantTests.cpp
EduPonz added a commit that referenced this pull request Dec 7, 2023
* Define a super client by environment variable  (#4047)

* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)

* Add GET_PID definition to DDS Participant tests

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

---------

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: elianalf <62831776+elianalf@users.noreply.github.com>
Co-authored-by: EduPonz <eduardoponz@eprosima.com>
EduPonz pushed a commit that referenced this pull request Dec 8, 2023
* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)

Co-authored-by: elianalf <62831776+elianalf@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request Dec 11, 2023
* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp
#	test/unittest/dds/participant/ParticipantTests.cpp
EduPonz pushed a commit that referenced this pull request Dec 12, 2023
* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)

Co-authored-by: elianalf <62831776+elianalf@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request Dec 18, 2023
* Define a super client by environment variable  (#4047)

* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp
#	test/unittest/dds/participant/ParticipantTests.cpp

* FIx conflicts

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Define a super client by environment variable  (#4047)

* Refs #19967: Add env variable ROS_SUPER_CLIENT

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Make SIMPLE to SUPER CLIENT, when ROS_SUPER_CLIENT is true

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Delete the change

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Add test superhost set by environment variable

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Uncrustify and clean

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Document the methods

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #19967: Change try-throw-catch in a simple log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Change string in log error

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit f40d54c)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp
#	test/unittest/dds/participant/ParticipantTests.cpp

* FIx conflicts

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Solve building issue due to backport

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Apply suggestion

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Fix test for udpv6

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Co-authored-by: elianalf <62831776+elianalf@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants