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) #4328

Merged
merged 1 commit into from
Feb 15, 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.11.x/pr-4237
Your branch is up to date with 'origin/2.11.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/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)
	deleted by us:   src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
	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.11.3 milestone Jan 30, 2024
@JesusPoderoso
Copy link
Contributor

@Mergifyio rebase 2.11.x

Copy link
Contributor Author

mergify bot commented Feb 1, 2024

rebase 2.11.x

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]

@MiguelCompany MiguelCompany removed conflicts Backport PR wich git cherry pick failed needs rebase labels Feb 1, 2024
@MiguelCompany MiguelCompany added the ci-pending PR which CI is running label Feb 1, 2024
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

2 similar comments
@JesusPoderoso
Copy link
Contributor

@richiprosima please test mac

@EduPonz
Copy link

EduPonz commented Feb 14, 2024

@richiprosima please test mac

@EduPonz
Copy link

EduPonz commented Feb 14, 2024

@Mergifyio rebase 2.11.x

@EduPonz
Copy link

EduPonz commented Feb 14, 2024

@richiprosima please test this

* 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>
Copy link
Contributor Author

mergify bot commented Feb 14, 2024

rebase 2.11.x

✅ Branch has been successfully rebased

@EduPonz
Copy link

EduPonz commented Feb 14, 2024

@richiprosima please test this

@EduPonz EduPonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Feb 15, 2024
@MiguelCompany MiguelCompany merged commit ee0565b into 2.11.x Feb 15, 2024
10 of 20 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.11.x/pr-4237 branch February 15, 2024 06:34
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