From 240873a227f8c04677fc67063fdc688efacf0068 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 27 Sep 2012 19:01:15 +0200 Subject: [PATCH 2/2] s3-smbd: Move housekeeping to the background process. If you add 200 printers using lpadmin. Then you wait for the printcap cache to expire. As soon as this expires we notify all deamons that they should reload the printers. This mean we need to create the default registry keys for each printer. If you do e.g. a 'smbclient -L' during that time you will get a lot of timeouts. This lets the housekeeping function of the printcap cache do the task of creating the default registry keys in background queue process. When it is done with the task it will tell all smbd childs to reload the printers and the 200 printers appear. (cherry picked from commit 76465b66b475404d03384048e67507f1c22ff269) Signed-off-by: Andreas Schneider --- source3/printing/queue_process.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source3/printing/queue_process.c b/source3/printing/queue_process.c index cf3becd..202eb9d 100644 --- a/source3/printing/queue_process.c +++ b/source3/printing/queue_process.c @@ -41,6 +41,15 @@ extern pid_t start_spoolssd(struct event_context *ev_ctx, static void reload_pcap_change_notify(struct tevent_context *ev, struct messaging_context *msg_ctx) { + /* + * Reload the printers first in the background process so that + * newly added printers get default values created in the registry. + * + * This will block the process for some time (~1 sec per printer), but + * it doesn't block smbd's servering clients. + */ + reload_printers(ev, msg_ctx); + message_send_all(msg_ctx, MSG_PRINTER_PCAP, NULL, 0, NULL); } -- 1.7.12