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

[16192] Fix notification lost (backport #3194) #3198

Merged
merged 2 commits into from
Jan 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2023

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

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

You are currently cherry-picking commit df2857a5f.
  (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/core/condition/WaitSetImpl.cpp
	modified:   src/cpp/fastdds/subscriber/DataReaderImpl.cpp
	modified:   test/unittest/dds/core/condition/WaitSetImplTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/subscriber/ReadConditionImpl.hpp

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

* fix notification lost

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* add a regression test

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* rename a variable name and update comments

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* fix uncrustify issue

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* make the regression test better

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* fix uncrustify

Signed-off-by: Chen Lihui <lihui.chen@sony.com>

* Refs #16192. Fix deadlock on WaitSetImpl.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #16192. Fix deadlock on ReadConditionImpl.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #16192. Use mutex instead of atomic.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #16192. Fix deadlock when constructing ReadConditionImpl.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Chen Lihui <lihui.chen@sony.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: Chen Lihui <lihui.chen@sony.com>
(cherry picked from commit df2857a)

# Conflicts:
#	src/cpp/fastdds/subscriber/ReadConditionImpl.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 10, 2023
@mergify mergify bot mentioned this pull request Jan 10, 2023
11 tasks
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jan 10, 2023
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit 4dd9652 into 2.8.x Jan 11, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.8.x/pr-3194 branch January 11, 2023 06:18
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.

1 participant