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

[20485] Fix SecureHelloworldExample #4416

Merged
merged 1 commit into from
Feb 21, 2024
Merged

[20485] Fix SecureHelloworldExample #4416

merged 1 commit into from
Feb 21, 2024

Conversation

Mario-DL
Copy link
Member

@Mario-DL Mario-DL commented Feb 21, 2024 •
edited by EduPonz
Loading

Description

As a consequence of #4375, the DDSSecureHelloWorldExample publisher is failing to initialize. This PR just modifies the history depth value to be the same as the max_samples_per_instance.

I also checked to launch other examples modifying the max_samples_per_instance and are OK. Nonetheless, I encourage the reviewer to double check that.

Note: We may cherry pick this commit in #4408 and #4406 and backport only to 2.10.x

@Mergifyio backport 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A The code follows the style guidelines of this project.
  • N/A 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
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • N/A Changes are ABI compatible.
  • N/A Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@Mario-DL
Refs #20485: Fix history depth to max_samples_per_instance value
14f0e6c 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL added the skip-ci Automatically pass CI label Feb 21, 2024
@Mario-DL Mario-DL added this to the v2.13.3 milestone Feb 21, 2024
JesusPoderoso
JesusPoderoso approved these changes Feb 21, 2024
View reviewed changes
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

Nice catch @Mario-DL!!
Thanks for checking and opening this PR.
I've double checked the remain examples too.

LGTM!!

@JesusPoderoso
Copy link
Contributor

@Mergifyio backport 2.10.x

@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 21, 2024 •
edited
Loading

backport 2.10.x

✅ Backports have been created

@JesusPoderoso JesusPoderoso added the ci-pending PR which CI is running label Feb 21, 2024
@EduPonz EduPonz 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 Feb 21, 2024
@EduPonz EduPonz merged commit 06a3056 into master Feb 21, 2024
13 checks passed
@EduPonz EduPonz deleted the bugfix/securehw-example branch February 21, 2024 20:14
mergify bot pushed a commit that referenced this pull request Feb 21, 2024
@Mario-DL @mergify
Fix SecureHelloworldExample (#4416)
858171f 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 06a3056)
@mergify mergify bot mentioned this pull request Feb 21, 2024
Merged
EduPonz pushed a commit that referenced this pull request Feb 23, 2024
@mergify @Mario-DL
Fix SecureHelloworldExample (#4416) (#4423)
c3342e0 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 06a3056)

Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
EduPonz pushed a commit that referenced this pull request Feb 24, 2024
@Mario-DL @EduPonz
Fix SecureHelloworldExample (#4416)
bc817f9 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
elianalf pushed a commit that referenced this pull request Mar 5, 2024
@Mario-DL @elianalf
Fix SecureHelloworldExample (#4416)
580cf90 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
EduPonz added a commit that referenced this pull request Mar 6, 2024
@mergify @JesusPoderoso
@Mario-DL @MiguelCompany @EduPonz
Check History QoS inconsistencies (#4375) (#4406)
cf03b85 
* Check History QoS inconsistencies (#4375)

* Refs #20401: Add regression test

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Check History QoS inconsistencies

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Check also the history depth vs resource limits max_sample_per_instance bounds

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Update HeartbeatWhileDestruction test

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Update unit test DDS profiles XML tests profile

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 68acb5a)

* Fix SecureHelloworldExample (#4416)

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Just show warning when inconsistency between depth and max_samples_per_instance (#4417)

* Refs #20503. Add regression test

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

* Refs #20503. Show warning when depth > max_samples_per_instance

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

* Refs #20503. Fix InvalidQos tests

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

---------

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: EduPonz <eduardoponz@eprosima.com>
Mario-DL added a commit that referenced this pull request Mar 19, 2024
@Mario-DL
Fix SecureHelloworldExample (#4416)
614ac65 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
EduPonz added a commit that referenced this pull request Apr 10, 2024
@mergify @JesusPoderoso
@Mario-DL @MiguelCompany @EduPonz
Check History QoS inconsistencies (#4375) (#4408)
cca4e18 
* Check History QoS inconsistencies (#4375)

* Refs #20401: Add regression test

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Check History QoS inconsistencies

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Check also the history depth vs resource limits max_sample_per_instance bounds

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Update HeartbeatWhileDestruction test

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Update unit test DDS profiles XML tests profile

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 68acb5a)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
#	src/cpp/fastdds/subscriber/DataReaderImpl.cpp
#	test/unittest/dds/profiles/test_xml_profiles.xml

* Refs #20401: Fix conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Fix SecureHelloworldExample (#4416)

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Just show warning when inconsistency between depth and max_samples_per_instance (#4417)

* Refs #20503. Add regression test

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

* Refs #20503. Show warning when depth > max_samples_per_instance

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

* Refs #20503. Fix InvalidQos tests

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

---------

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

* Refs #20401: Fix warning

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20401: Fix segfault in Mac tests

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: Jesús Poderoso <120394830+JesusPoderoso@users.noreply.github.com>
Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: EduPonz <eduardoponz@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JesusPoderoso JesusPoderoso JesusPoderoso approved these changes

Assignees
No one assigned
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. skip-ci Automatically pass CI
Projects
None yet
Milestone
v2.13.3
Development

Successfully merging this pull request may close these issues.
3 participants
@Mario-DL @JesusPoderoso @EduPonz