Merge pull request #15320 from donaldsharp/vtysh_limit_fds

lib, ospfclient, vtysh: Allow for a minimum fd poll size
FRRouting · Feb 13, 2024 · e74c3b0 · e74c3b0
2 parents 17a0a62 + 729dd6f
commit e74c3b0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/event.c b/lib/event.c
@@ -570,9 +570,12 @@ struct event_loop *event_master_create(const char *name)
 		rv->fd_limit = (int)limit.rlim_cur;
 	}
 
-	if (rv->fd_limit > STUPIDLY_LARGE_FD_SIZE)
-		zlog_warn("FD Limit set: %u is stupidly large.  Is this what you intended?  Consider using --limit-fds",
-			  rv->fd_limit);
+	if (rv->fd_limit > STUPIDLY_LARGE_FD_SIZE) {
+		zlog_warn("FD Limit set: %u is stupidly large.  Is this what you intended?  Consider using --limit-fds also limiting size to %u",
+			  rv->fd_limit, STUPIDLY_LARGE_FD_SIZE);
+
+		rv->fd_limit = STUPIDLY_LARGE_FD_SIZE;
+	}
 
 	rv->read = XCALLOC(MTYPE_EVENT_POLL,
 			   sizeof(struct event *) * rv->fd_limit);