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

[19696][20409] Fix data race on PDP (backport #4220) #4431

Merged
merged 2 commits into from
Mar 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2024

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

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

You are currently cherry-picking commit 305383295.
  (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/attributes/ServerAttributes.h
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp

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


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
@mergify mergify bot mentioned this pull request Feb 22, 2024
10 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Feb 22, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Feb 23, 2024

@juanlofer-eprosima @Tempate 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

@juanlofer-eprosima juanlofer-eprosima force-pushed the mergify/bp/2.6.x/pr-4220 branch 2 times, most recently from f38f588 to 063cba6 Compare February 29, 2024 15:15
@Mario-DL
Copy link
Member

@Mergifyio rebase 2.6.x

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
Copy link
Contributor Author

mergify bot commented Mar 19, 2024

rebase 2.6.x

✅ Branch has been successfully rebased

@Mario-DL
Copy link
Member

@richiprosima please test this

@Mario-DL Mario-DL added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Mar 19, 2024
@Mario-DL Mario-DL closed this Mar 20, 2024
@Mario-DL Mario-DL reopened this Mar 20, 2024
@Mario-DL
Copy link
Member

@richiprosima please test windows

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.

The scarce failed tests are unrelated, 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 Mar 21, 2024
@EduPonz EduPonz merged commit 4d82910 into 2.6.x Mar 22, 2024
15 of 21 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4220 branch March 22, 2024 15:35
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