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

[20599] Protect asio exception hotfix (backport #4527) #4533

Merged
merged 2 commits into from
May 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2024

This is an automatic backport of pull request #4527 done by Mergify.
Cherry-pick of 08193d5 has failed:

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

You are currently cherry-picking commit 08193d5f7.
  (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/transport/TCPTransportInterface.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/pull-requests/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 Mar 8, 2024
Copy link
Contributor Author

mergify bot commented Mar 8, 2024

Cherry-pick of 08193d5 has failed:

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

You are currently cherry-picking commit 08193d5f7.
  (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/transport/TCPTransportInterface.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Mar 8, 2024
10 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.8 milestone Mar 8, 2024
@cferreiragonz
Copy link
Contributor

@cferreiragonz
Copy link
Contributor

This PR also backports features of #4319 and some features of #4300 that could not be backported in #4513 because of the missing features of #4319.

@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4527 branch from 7f03c2d to f2e0bc1 Compare April 4, 2024 13:55
@cferreiragonz cferreiragonz changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4300 April 4, 2024 13:56
@cferreiragonz cferreiragonz added temporarily-blocked PR must be merged after another one and removed conflicts Backport PR wich git cherry pick failed needs rebase labels Apr 4, 2024
@Mario-DL Mario-DL modified the milestones: v2.6.8, v2.6.9 Apr 23, 2024
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4300 branch from 05c889a to 8b9a329 Compare April 23, 2024 12:39
@Mario-DL Mario-DL force-pushed the mergify/bp/2.6.x/pr-4300 branch 2 times, most recently from 807d8b9 to b1e2cf0 Compare May 20, 2024 07:41
Base automatically changed from mergify/bp/2.6.x/pr-4300 to 2.6.x May 27, 2024 10:36
@Mario-DL Mario-DL added conflicts Backport PR wich git cherry pick failed and removed temporarily-blocked PR must be merged after another one labels May 27, 2024
@Mario-DL
Copy link
Member

@cferreiragonz could you take a look at the conflicts here ? We are finally unblocked for merging this PR !

cferreiragonz and others added 2 commits May 27, 2024 16:13
* Refs #20599: Handle error code before function call

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Apply suggestion

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 08193d5)

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp
* Protect asio exception hotfix (#4527)

* Refs #20599: Handle error code before function call

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Apply suggestion

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 08193d5)

* Backport of #4319 && Partial backport of #4300

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4527 branch from f2e0bc1 to b268841 Compare May 27, 2024 14:13
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels May 27, 2024
@Mario-DL Mario-DL self-requested a review May 28, 2024 05:37
@Mario-DL
Copy link
Member

@richiprosima please test this

Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

LGTM, failed tests unrelated with the TCP transport changes in this PR. RTM

@Mario-DL Mario-DL removed the ci-pending PR which CI is running label May 29, 2024
@Mario-DL Mario-DL added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label May 29, 2024
@EduPonz EduPonz merged commit 27df835 into 2.6.x May 29, 2024
11 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4527 branch May 29, 2024 06:26
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.

4 participants