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

[17961] Select correct listener for on_requested_deadline_missed (backport #3423) #3453

Merged
merged 1 commit into from
May 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 14, 2023

This is an automatic backport of pull request #3423 done by Mergify.
Cherry-pick of 40411d9 has failed:

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

You are currently cherry-picking commit 40411d968.
  (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/publisher/DataWriterImpl.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/DDSBlackboxTestsDataWriter.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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Apr 14, 2023
@JLBuenoLopez JLBuenoLopez added this to the v2.6.5 milestone Apr 14, 2023
@JLBuenoLopez
Copy link
Contributor

@EduPonz, this backport has conflicts that should be solved. Can you take a look?

@EduPonz EduPonz force-pushed the mergify/bp/2.6.x/pr-3423 branch from a17b324 to 5a34bdc Compare May 10, 2023 07:09
* Refs #17961: Regression test for segfault

Signed-off-by: Eduardo Ponz <[email protected]>

* Refs #17961: Use the correct listener for deadline

Signed-off-by: Eduardo Ponz <[email protected]>

* Refs #17961: Fixed Windows warning regarding double to uint32 cast

Signed-off-by: Javier Santiago <[email protected]>

* Refs #17961: Test fix

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Eduardo Ponz <[email protected]>
Signed-off-by: Javier Santiago <[email protected]>
Signed-off-by: Mario Dominguez <[email protected]>
Co-authored-by: Javier Santiago <[email protected]>
Co-authored-by: Mario Dominguez <[email protected]>
(cherry picked from commit 40411d9)
@EduPonz EduPonz force-pushed the mergify/bp/2.6.x/pr-3423 branch from 5a34bdc to 86182a4 Compare May 10, 2023 07:10
@EduPonz EduPonz added needs-review PR that is ready to be reviewed and removed conflicts Backport PR wich git cherry pick failed labels May 10, 2023
@EduPonz
Copy link

EduPonz commented May 10, 2023

@richiprosima please test this

@JLBuenoLopez
Copy link
Contributor

@richiprosima please test windows

MacOS CI failures are unrelated. I am concerned about the test failing in both Windows runs: BlackboxTests_DDS_PIM.Discovery.TwentyParticipantsSeveralEndpointsUnicast.Datasharing. Asking for a Windows rerun to check.

@JLBuenoLopez
Copy link
Contributor

@richiprosima please test windows

@JLBuenoLopez
Copy link
Contributor

CI failures are unrelated

Copy link
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

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

LGTM

@JLBuenoLopez JLBuenoLopez added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed needs-review PR that is ready to be reviewed labels May 12, 2023
@EduPonz EduPonz merged commit 23e4c76 into 2.6.x May 12, 2023
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-3423 branch May 12, 2023 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants