Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 8, 2025

This reverts the vtysh_flush() part of #16672 since it is just plain not permissible to do that. There's a cascaded partial revert of #17571, but that was only a minor adjustment and it remains intact in the general sense.

A better/correct fix would be to do something like engineering a vtysh_try_flush() function; but I'd prefer to not do that on stable versions, so here's a revert to get back to functionally correct before we take another go at the memory spike problem.

cf. #19040 for related discussion (this revert should make that PR unnecessary)


This is an automatic backport of pull request #19109 done by Mergify.

eqvinox added 2 commits July 8, 2025 15:47
This *partially* reverts commit 959dbe2
in order to revert 9112fb3 (which is
not correct.)

The socket buffer sizing changes are left in place.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit 56e8ce7)
This partially reverts commit 9112fb3.

It is not permissible/possible to call vtysh_flush() from vty_out() as
it may unexpectedly close the vty.  This is only permitted to happen
during a VTY event triggered from the event loop, not from a vty_out()
call in a random place mid-code.

The socket buffer size changes are left in place.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit 1c50a1e)
@frrbot frrbot bot added the vtysh label Jul 8, 2025
@mjstapp mjstapp merged commit f3eefc1 into stable/10.3 Jul 8, 2025
17 checks passed
@Jafaral Jafaral deleted the mergify/bp/stable/10.3/pr-19109 branch July 31, 2025 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants