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

[14752] Fix WLP deadlock (backport #2715) #2788

Merged
merged 2 commits into from
Jul 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2022

This is an automatic backport of pull request #2715 done by Mergify.
Cherry-pick of 01a55d4 has failed:

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

You are currently cherry-picking commit 01a55d4e4.
  (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/reader/StatefulReader.cpp
	both modified:   src/cpp/rtps/reader/StatelessReader.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 Jun 29, 2022
@mergify mergify bot mentioned this pull request Jun 29, 2022
8 tasks
@JLBuenoLopez JLBuenoLopez added this to the v2.3.5 milestone Jul 21, 2022
JLBuenoLopez and others added 2 commits July 21, 2022 14:54
* Refs #14752: fix WLP deadlock

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>

* Refs #14752: linters

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit 01a55d4)

# Conflicts:
#	src/cpp/rtps/reader/StatefulReader.cpp
#	src/cpp/rtps/reader/StatelessReader.cpp
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
@JLBuenoLopez JLBuenoLopez force-pushed the mergify/bp/2.3.x/pr-2715 branch from 610f847 to ac63c53 Compare July 21, 2022 12:55
@JLBuenoLopez JLBuenoLopez removed the conflicts Backport PR wich git cherry pick failed label Jul 21, 2022
@JLBuenoLopez
Copy link
Contributor

@richiprosima please test this

Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany MiguelCompany merged commit 326c410 into 2.3.x Jul 21, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.3.x/pr-2715 branch July 21, 2022 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants