lib: revert addition of vtysh_flush() call in vty_out() #19109
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>
mjstapp
reviewed
Jul 1, 2025
| @@ -346,17 +346,8 @@ int vty_out(struct vty *vty, const char *format, ...) | |||
| case VTY_SHELL_SERV: | |||
| case VTY_FILE: | |||
| default: | |||
| vty->vty_buf_size_accumulated += strlen(filtered); | |||
There was a problem hiding this comment.
can we do something more limited, just for instance removing the direct call to "vtysh_flush" ? We might well want to keep the counters that are part of the progressive send logic, for example.
mjstapp
approved these changes
Jul 8, 2025
|
@Mergifyio backport dev/10.4 stable/10.3 |
✅ Backports have been created
|
This was referenced Jul 8, 2025
mjstapp
added a commit
that referenced
this pull request
Jul 8, 2025
lib: revert addition of vtysh_flush() call in vty_out() (backport #19109)
ton31337
added a commit
that referenced
this pull request
Jul 9, 2025
lib: revert addition of vtysh_flush() call in vty_out() (backport #19109)
ton31337
added a commit
to opensourcerouting/frr
that referenced
this pull request
Aug 2, 2025
* bgpd: correct no form commands (backport FRRouting#18911) * bgpd: fix to show exist/non-exist-map in 'show run' properly FRRouting#18853 * redhat: make FRR RPM build to work on RedHat 10 (backport FRRouting#18920) * build: check for libunwind.h, not unwind.h (backport FRRouting#18912) * bgpd: use AS4B format for BGP loc-rib messages. (backport FRRouting#18936) * bgpd: fix for the validity and the presence of prefixes in the BGP VPN table. (backport FRRouting#17370) * bgpd: Force adj-rib-out updates if MRAI is kicked in (backport FRRouting#18959) * zebra: Provide SID value when sending SRv6 SID release notify message (backport FRRouting#18971) * bgpd: Fix crash when fetching statistics for bgp instance (backport FRRouting#19003) * nhrpd: fix crash when accessing invalid memory zone (backport FRRouting#18994) * zebra: Initialize RB tree for router tables (backport FRRouting#19049) * zebra: fix null pointer dereference in zebra_evpn_sync_neigh_del (backport FRRouting#19054) * zebra: fix stale NHG in kernel (backport FRRouting#18899) * bgpd: Fix incorrect stripping of transitive extended communities (backport FRRouting#19065) * lib: Fix no on-match goto NUM command (backport FRRouting#19108) * bgpd: Fix extended community check for IP non-transitive type (backport FRRouting#19097) * bgpd: Fix DEREF_OF_NULL.EX.COND in bgp_updgrp_packet (backport FRRouting#19126) * lib: revert addition of vtysh_flush() call in vty_out() (backport FRRouting#19109) * bgpd: Extract link bandwidth value from extcommunity before using for WCMP (backport FRRouting#19165) * Use ipv4 class E addresses (240.0.0.0/4) as connected routes by default (backport FRRouting#18095) * bfdd: Set bfd.LocalDiag when transitioning to AdminDown (backport FRRouting#18592) * zebra: clean up a json object leak (backport FRRouting#19192) * bgpd: Do not try to reuse freed route-maps (backport FRRouting#19191) * lib: fix routemap crash (backport FRRouting#19127) * bgpd: initialize local variable (backport FRRouting#19233) * ospfd: Use after free cleanup of lsa (backport FRRouting#19224) * vtysh: copy config from file should actually apply (backport FRRouting#19242) * bgpd : Fix compilation error in bgpd module: Update TP_ARGS for bgp (backport FRRouting#19266) * bgpd: Ensure addpath does not withdraw selected route in some situations (backport FRRouting#19210) * lib, zebra: mark singleton nexthops inactive/active on link state changes for wecmp (backport FRRouting#18947) * eigrp: validate hello packets and tlvs better (backport FRRouting#19251) * bgpd: [GR] fixed selectionDeferralTimer to display select_defer_time val FRRouting#19283 Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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)