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

[15905] Fix dataraces when creating DataWriters (backport #3008) #3016

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 14, 2022

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

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

You are currently cherry-picking commit 4391864a8.
  (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:   src/cpp/fastdds/domain/DomainParticipantImpl.cpp
	modified:   src/cpp/fastdds/domain/DomainParticipantImpl.hpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
	deleted by us:   test/blackbox/common/DDSBlackboxTestsBasic.cpp
	both modified:   test/blackbox/common/RTPSBlackboxTestsBasic.cpp

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

* Refs #15905: Declare the PublishMode running flag as atomic

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #15905: Add RTPS regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #15905: Add DomainParticipantImpl::create_instance_handle data race regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #15905: Set DomainParticipantImpl::next_instance_id_ as atomic

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #15905: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 4391864)

# Conflicts:
#	src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
#	test/blackbox/common/DDSBlackboxTestsBasic.cpp
#	test/blackbox/common/RTPSBlackboxTestsBasic.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Oct 14, 2022
@MiguelCompany
Copy link
Member

closing in favor of #3051

@mergify mergify bot deleted the mergify/bp/2.1.x/pr-3008 branch October 28, 2022 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants