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

[20722] Force unlimited ResourceLimits if lower or equal to zero (backport #4617) #4654

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 4, 2024

Description

This PR forces the ResourceLimitsQoS values (max_samples, max_instances and max_samples_per_instance) to be considered as unlimited if a value greater than zero is NOT provided.

@Mergifyio backport 2.13.x 2.10.x 2.6.x

Fixes #4609

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
  • N/A 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: [20722] Update docs to force unlimited ResourceLimits if lower or equal to zero Fast-DDS-docs#738
  • 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.

This is an automatic backport of pull request #4617 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 4, 2024
Copy link
Contributor Author

mergify bot commented Apr 4, 2024

Cherry-pick of 31b8ad1 has failed:

On branch mergify/bp/2.6.x/pr-4617
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 31b8ad145.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/fastdds/publisher/DataWriterHistory.cpp
	modified:   src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp
	modified:   src/cpp/fastrtps_deprecated/publisher/PublisherHistory.cpp
	modified:   src/cpp/fastrtps_deprecated/subscriber/SubscriberHistory.cpp
	modified:   test/mock/rtps/PublisherHistory/fastdds/publisher/DataWriterHistory.hpp
	modified:   test/mock/rtps/PublisherHistory/fastrtps/publisher/PublisherHistory.h
	modified:   test/performance/throughput/ThroughputPublisher.cpp
	modified:   test/performance/throughput/ThroughputSubscriber.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/dds/core/policy/QosPolicies.hpp
	both modified:   test/unittest/dds/publisher/DataWriterTests.cpp
	both modified:   test/unittest/dds/subscriber/DataReaderTests.cpp
	both modified:   test/unittest/dds/topic/TopicTests.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Mario-DL
Copy link
Member

@JesusPoderoso would you mind addressing the conflicts here ?

@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Apr 10, 2024
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.6.x/pr-4617 branch from 73e2b14 to 77fad83 Compare April 10, 2024 06:56
@JesusPoderoso JesusPoderoso requested a review from Mario-DL April 10, 2024 06:56
* Refs #20638: Force unlimited ResourceLimits if lower or equal to zero

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #20722: Apply rev suggestions

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #20722: Include check in previous tests

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #20722: Fix test typo

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 31b8ad1)
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.6.x/pr-4617 branch from 77fad83 to 00f63fa Compare April 10, 2024 06:59
@JesusPoderoso JesusPoderoso requested review from Mario-DL and removed request for Mario-DL April 10, 2024 06:59
@github-actions github-actions bot added ci-pending PR which CI is running labels Apr 10, 2024
@Mario-DL
Copy link
Member

@richiprosima please test this

@Mario-DL
Copy link
Member

@JesusPoderoso we may take a look at this since the following tests have consistently failed projectroot.test.unittest.dds.publisher.DataWriterTests.InstancePolicyAllocationConsistencyKeyed projectroot.test.unittest.dds.subscriber.DataReaderTests.InstancePolicyAllocationConsistencyKeyed projectroot.test.unittest.dds.topic.TopicTests.InstancePolicyAllocationConsistencyKeyed

These tests fail because #2807 was not backported. Consequently, in 2.6.x we are missing checking for max_samples < ( max_instances * max_samples_per_instance ) in every entity. What should we do @EduPonz @MiguelCompany ?

@Mario-DL Mario-DL modified the milestones: v2.6.8, v2.6.9 Apr 23, 2024
@Mario-DL
Copy link
Member

As this PR implies cherry-picking a prior PR that imposes a change of behavior, we finally decided not to go ahead with none of them.

@Mario-DL Mario-DL closed this May 14, 2024
@mergify mergify bot deleted the mergify/bp/2.6.x/pr-4617 branch May 14, 2024 08:08
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.

2 participants