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

Deadline error when no Reliable DataReaders in VOLATILE DataWriters [12321] (backport #2112) #2120

Merged
merged 2 commits into from
Aug 5, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2021

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

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

You are currently cherry-picking commit e357fe85f.
  (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:   test/blackbox/common/BlackboxTestsDeadlineQos.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/publisher/DataWriterImpl.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.io/

…2112)

* Refs #12321: Change handle reference

Signed-off-by: jparisu <javierparis@eprosima.com>

* Refs #12321: Add regression tests

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

* Refs #12321: Make test more robust

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

* Refs 12321: Apply suggestions

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

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
(cherry picked from commit e357fe8)

# Conflicts:
#	src/cpp/fastdds/publisher/DataWriterImpl.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Aug 5, 2021
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Aug 5, 2021
@MiguelCompany MiguelCompany merged commit 7ef4e90 into 2.1.x Aug 5, 2021
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-2112 branch August 5, 2021 18:29
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