eProsima / Fast-DDS

The most complete DDS - Proven: Plenty of success cases. Looking for commercial support? Contact info@eprosima.com
https://eprosima.com
Apache License 2.0
2.04k stars 729 forks source link

[20650] Create InitialConnection for TCP initial peers 2.13 & 2.10 & 2.6 (backport #4947) #5003

Closed mergify[bot] closed 2 days ago

mergify[bot] commented 1 week ago

Description

This PR uses the features introduced in https://github.com/eProsima/Fast-DDS/pull/4584 to ALWAYS create a connection channel for the TCP when initial peers are configured.

@Mergifyio backport 2.10.x 2.6.x

Contributor Checklist

Reviewer Checklist

mergify[bot] commented 1 week ago

Cherry-pick of a0a4feeff3a5b8204a30ee56ed65b8a3c3309bac has failed:

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

You are currently cherry-picking commit a0a4feeff.
  (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/rtps/builtin/discovery/participant/PDPSimple.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   test/blackbox/common/BlackboxTestsTransportTCP.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