lib, ospfclient, vtysh: Allow for a minimum fd poll size #15320
Merged
+6
−3
Conversation
This file contains 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
donaldsharp
force-pushed
the
vtysh_limit_fds
branch
from
9bedb67 to
a0925ad
Compare
mjstapp
reviewed
Feb 7, 2024
lib/frrevent.h
Outdated
| * limit_fds - Ignore the systems built in limit and use 1000 or | ||
| * the actual value which ever is lesser | ||
| */ | ||
| extern struct event_loop *event_master_create(const char *name, bool limit_fds); |
There was a problem hiding this comment.
gosh, I'd rather we not change this one api like this
lib/event.c
Outdated
| @@ -544,7 +544,8 @@ static void initializer(void) | |||
| } | |||
|
|
|||
| #define STUPIDLY_LARGE_FD_SIZE 100000 | |||
| struct event_loop *event_master_create(const char *name) | |||
| #define FD_LIMIT_SIZE_FOR_VTYSH 1000 | |||
There was a problem hiding this comment.
so "VTYSH" is a little off-target, since there are plenty (dozen?) of non-vtysh places where there can be an issue
lib/event.c
Outdated
| @@ -570,6 +571,9 @@ struct event_loop *event_master_create(const char *name) | |||
| rv->fd_limit = (int)limit.rlim_cur; | |||
| } | |||
|
|
|||
| if (limit_fds) | |||
There was a problem hiding this comment.
it's a problem for any process to try to use an unreasonable number, isn't it? let's make a reasonable default upper limit, and then let someone who really knows what they're doing ask for a bigger number explicitly. like, limit to MIN(fd_setsize, FRRLIMIT), and then exceed that limit only if specifically asked to.
what'd that upper-limit be; what'd make sense for bgp, especially? 10K? 64K?
There exists cases where just honoring the FD_LIMIT size as given to us by the operating system makes no sense. Let's just make a switch to allow for this for things like vtysh and ospfclient which will never have 1k files open at any given time. Fixes: FRRouting#15315 Signed-off-by: Donald Sharp <[email protected]>
donaldsharp
force-pushed
the
vtysh_limit_fds
branch
from
a0925ad to
729dd6f
Compare
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.
There exists cases where just honoring the FD_LIMIT size as given to us by the operating system makes no sense. Let's just make a switch to allow for this for things like vtysh and ospfclient which will never have 1k files open at any given time.
Fixes: #15315