From 50d503b78162af52bf881d3bc6db9eb82fc4ddfc Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Thu, 17 Jan 2019 20:01:06 +0000 Subject: [PATCH] Workaround for nscd(8) failure with large entries. It fixes a case where eg a 2KB group entry would take several seconds to complete with cache enabled in nsswitch.conf. MFC after: 2 weeks Sponsored by: Chalmers University of Technology Differential Revision: https://reviews.freebsd.org/D18392 --- usr.sbin/nscd/nscd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c index cd5cbf1a2635..3c3ebda565f6 100644 --- a/usr.sbin/nscd/nscd.c +++ b/usr.sbin/nscd/nscd.c @@ -405,6 +405,12 @@ process_socket_event(struct kevent *event_data, struct runtime_env *env, * process_socket_event). */ if (qstate->kevent_watermark > MAX_SOCKET_IO_SIZE) { +#if 0 + /* + * XXX: Uncommenting this code makes nscd(8) fail for + * entries larger than a few kB, causing few second + * worth of delay for each call to retrieve them. + */ if (qstate->io_buffer != NULL) free(qstate->io_buffer); @@ -421,6 +427,7 @@ process_socket_event(struct kevent *event_data, struct runtime_env *env, if (qstate->kevent_filter == EVFILT_READ) qstate->use_alternate_io = 1; +#endif qstate->io_buffer_watermark = MAX_SOCKET_IO_SIZE; EV_SET(&eventlist[1], event_data->ident,