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

[20119] TCP socket send buffer limit (backport #4237) #4330

Merged
merged 1 commit into from
Mar 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 30, 2024

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

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

You are currently cherry-picking commit b5f8c8adc.
  (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/rtps/attributes/RTPSParticipantAttributes.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResource.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResource.h
	modified:   src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResourceSecure.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/TCPv6Tests.cpp
	both modified:   test/unittest/transport/mock/MockTCPv4Transport.h
	deleted by us:   test/unittest/transport/mock/MockTCPv6Transport.h
	both modified:   versions.md

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 Jan 30, 2024
@mergify mergify bot mentioned this pull request Jan 30, 2024
14 tasks
@MiguelCompany MiguelCompany added this to the v2.6.8 milestone Jan 30, 2024
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.6.x/pr-4237 branch from b6c7047 to 5fdd345 Compare January 30, 2024 14:53
@MiguelCompany MiguelCompany changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4216 January 30, 2024 14:54
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jan 30, 2024
@MiguelCompany
Copy link
Member

This has been rebased on top of #4287, and should be merged after.

@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4216 branch from 0786256 to 869217d Compare February 23, 2024 12:12
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4237 branch from 5fdd345 to 755abc6 Compare February 23, 2024 12:16
@jepemi
Copy link
Contributor

jepemi commented Feb 23, 2024

@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4216 branch from 869217d to 8c1bfe5 Compare March 7, 2024 09:27
Base automatically changed from mergify/bp/2.6.x/pr-4216 to 2.6.x March 18, 2024 15:06
@Mario-DL
Copy link
Member

@jepemi would you mind rebasing on top of 2.6.x and solving the conflicts here ? This is the next in the row 😄

* Refs #20119: Check send buffer queue before sending new data

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Add non_blocking_send attribute to tcp

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Add test

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Add non-blocking send to secure socket

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Update versions.md

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Uncrustify

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: non_blocking_send moved to properties

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Apply suggestions

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20119: Fix Windows&Mac build warnings

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

---------

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
@jepemi jepemi force-pushed the mergify/bp/2.6.x/pr-4237 branch from 755abc6 to ce11371 Compare March 19, 2024 15:11
@Mario-DL
Copy link
Member

@richiprosima please test this

@Mario-DL
Copy link
Member

Failed tests in github ci unrelated. Ready to merge

@Mario-DL Mario-DL added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Mar 25, 2024
@EduPonz EduPonz merged commit 2c67f2e into 2.6.x Mar 26, 2024
11 of 15 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4237 branch March 26, 2024 07:07
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