[19696][20409] Fix data race on PDP (backport #4220)
This is an automatic backport of pull request #4220 done by Mergify. Cherry-pick of 305383295a9bbb9f12c5c0aa303667872d65ea33 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 refreshwill re-evaluate the rules -
@Mergifyio rebasewill rebase this PR on its base branch -
@Mergifyio updatewill 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
@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
@Mergifyio rebase 2.6.x
rebase 2.6.x
✅ Branch has been successfully rebased
@richiprosima please test this
@richiprosima please test windows