Fast-DDS icon indicating copy to clipboard operation
Fast-DDS copied to clipboard

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

Open mergify[bot] opened this issue 1 year ago • 1 comments

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 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[bot] avatar Feb 22 '24 11:02 mergify[bot]

@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

Mario-DL avatar Feb 23 '24 07:02 Mario-DL

@Mergifyio rebase 2.6.x

Mario-DL avatar Mar 19 '24 07:03 Mario-DL

rebase 2.6.x

✅ Branch has been successfully rebased

mergify[bot] avatar Mar 19 '24 07:03 mergify[bot]

@richiprosima please test this

Mario-DL avatar Mar 19 '24 07:03 Mario-DL

@richiprosima please test windows

Mario-DL avatar Mar 20 '24 13:03 Mario-DL