Skip to content

[19665] Hotfix TCP sender resources creation (backport #3932) #3964

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

Merged
merged 2 commits into from
Nov 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2023

This is an automatic backport of pull request #3932 done by Mergify.
Cherry-pick of e94deb8 has failed:

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

You are currently cherry-picking commit e94deb85d.
  (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/fastrtps/utils/IPLocator.h
	modified:   src/cpp/rtps/transport/ChainingSenderResource.hpp
	modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/UDPSenderResource.hpp
	modified:   src/cpp/utils/IPLocator.cpp
	modified:   test/blackbox/common/BlackboxTestsTransportCustom.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPSenderResource.hpp
	both modified:   src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.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 #19665: Check if casting from a ChainingSender instead of SenderResource to avoid failing the cast

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #19665: Regression test

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #19665: Check if remote WAN  sender resource already exists

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #19655: Linter

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #19665: fix test mac vars init

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #19665: Apply Rev suggestions

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit e94deb8)

# Conflicts:
#	src/cpp/rtps/transport/TCPSenderResource.hpp
#	src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Oct 26, 2023
@JLBuenoLopez JLBuenoLopez added this to the v2.6.7 milestone Oct 27, 2023
@JLBuenoLopez
Copy link
Contributor

@Mario-DL can you please look into the conflicts?

Signed-off-by: Mario Dominguez <[email protected]>
@Mario-DL
Copy link
Member

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed conflicts Backport PR wich git cherry pick failed ci-pending PR which CI is running labels Nov 7, 2023
@EduPonz EduPonz merged commit 4a8e701 into 2.6.x Nov 13, 2023
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-3932 branch November 13, 2023 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants