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

[20438] LARGE_DATA Participants logic with same listening ports (backport #4396) #4434

Merged
merged 2 commits into from
Apr 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2024

This is an automatic backport of pull request #4396 done by Mergify.
Cherry-pick of 3ff9180 has failed:

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

You are currently cherry-picking commit 3ff918061.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/TCPv6Tests.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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


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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 22, 2024
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Feb 22, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Feb 23, 2024

@cferreiragonz would you mind taking a look at the conflicts ?
Also, take advantage to rebase, so that we have both windows & mac on github working for this branch

@cferreiragonz cferreiragonz changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4324 February 28, 2024 14:33
@cferreiragonz
Copy link
Contributor

@cferreiragonz cferreiragonz added temporarily-blocked PR must be merged after another one and removed conflicts Backport PR wich git cherry pick failed labels Mar 26, 2024
Base automatically changed from mergify/bp/2.6.x/pr-4324 to 2.6.x April 16, 2024 06:05
@Mario-DL
Copy link
Member

@cferreiragonz would you mind looking at the conflicts here ? Next one in the loop !

* Refs #20438: Add unittest to validate interfaces check

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20438: Add support to same listening_port and different IP address

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20438: Fix Windows build

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20438: Add Ipv6 addresses support

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20438: Remove repeated addition of listener port (added by default)

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20438: Apply suggestions

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20438: Apply suggestions: ipv6

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #20438: Fix windows build

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 3ff9180)
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed temporarily-blocked PR must be merged after another one labels Apr 16, 2024
@Mario-DL
Copy link
Member

@richiprosima please test this

@Mario-DL
Copy link
Member

@richiprosima please test windows

@Mario-DL
Copy link
Member

@cferreiragonz do you think that the failed test BlackboxTests_DDS_PIM.TransportTCP.large_data_topology.Transport in the ubuntu github ci is related ? Otherwise, LGTM

@cferreiragonz
Copy link
Contributor

@cferreiragonz do you think that the failed test BlackboxTests_DDS_PIM.TransportTCP.large_data_topology.Transport in the ubuntu github ci is related ? Otherwise, LGTM

I believe that is unrelated with this PR. I could not reproduce the timeout locally after multiple tries.

@Mario-DL Mario-DL 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 Apr 18, 2024
@EduPonz EduPonz merged commit 329849b into 2.6.x Apr 18, 2024
11 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4396 branch April 18, 2024 12:55
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