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

[20121] Remove unnecessary TCP warning & Fix some tests (backport #4217) #4275

Merged
merged 3 commits into from
Feb 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 22, 2024

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

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

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

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/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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 22, 2024
@mergify mergify bot mentioned this pull request Jan 22, 2024
10 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Jan 22, 2024
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jan 22, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test linux please test mac

@Mario-DL
Copy link
Member

@richiprosima please test linux test mac

@Mario-DL
Copy link
Member

@jepemi same also here
Thanks !

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
(cherry picked from commit ab94226)
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Copy link
Member

I am going ahead and take advantage of this PR to include a couple of commits that fix some of the failing tests of the 2.6.x branch.

@Mario-DL Mario-DL changed the title [20121] Remove unnecessary TCP warning (backport #4217) [20121] Remove unnecessary TCP warning & Fix some tests (backport #4217) Feb 26, 2024
@Mario-DL
Copy link
Member

@richiprosima please test linux test discovery_server

@Mario-DL
Copy link
Member

Failing tests on Windows v141 are not related and different tests fail in different runs. Thread sanitizer has no deadlocks but is stuck in the post setup ccache step and it reports fail due to that.
Marking the PR as ready to merge

@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 Feb 28, 2024
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
first-to-merge 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