Skip to content

[15896] Fix selection of output locators (backport #3003)#3010

Merged
MiguelCompany merged 2 commits into2.7.xfrom
mergify/bp/2.7.x/pr-3003
Oct 15, 2022
Merged

[15896] Fix selection of output locators (backport #3003)#3010
MiguelCompany merged 2 commits into2.7.xfrom
mergify/bp/2.7.x/pr-3003

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 13, 2022

This is an automatic backport of pull request #3003 done by Mergify.
Cherry-pick of 23a788d has failed:

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

You are currently cherry-picking commit 23a788dd0.
  (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:   include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h
	modified:   include/fastdds/rtps/writer/StatefulWriter.h
	modified:   src/cpp/rtps/messages/RTPSMessageGroup.cpp
	modified:   src/cpp/rtps/transport/test_UDPv4Transport.cpp
	modified:   src/cpp/rtps/transport/test_UDPv4Transport.h
	modified:   src/cpp/rtps/writer/StatefulWriter.cpp
	modified:   test/blackbox/common/BlackboxTestsDiscovery.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/writer/StatelessWriter.cpp
	both modified:   test/blackbox/api/dds-pim/PubSubReader.hpp
	both modified:   test/blackbox/api/dds-pim/PubSubWriter.hpp
	both modified:   test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
	both modified:   test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #15839. Adding test_UDPv4Transport::should_drop_locator.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Adding destination locator filter to test_UDPv4Transport

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid calling filters for packets that will be dropped by parent transport.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubReader.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Add method set initial announcements to PubSubWriter.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Regression test added.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before asking on the number of locators selected.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Call select_locators before checking for global gap.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Do not reset locator selector inside deliver_sample_nts.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Avoid reseting locator selector on send_heartbeat_piggyback_nts_.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatelessWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15839. Improvements on StatefulWriter

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Avoid arithmetic overflow on limitation check.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Apply suggestions from code review.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #15896. Add local filter for locators.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 23a788d)

# Conflicts:
#	src/cpp/rtps/writer/StatelessWriter.cpp
#	test/blackbox/api/dds-pim/PubSubReader.hpp
#	test/blackbox/api/dds-pim/PubSubWriter.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
#	test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Oct 13, 2022
@mergify mergify bot mentioned this pull request Oct 13, 2022
9 tasks
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Copy Markdown
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Oct 13, 2022
@MiguelCompany MiguelCompany merged commit 90229f5 into 2.7.x Oct 15, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.7.x/pr-3003 branch October 15, 2022 10:52
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.

1 participant