sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

ldap: Add a database open after fork to speed-up prefork binds

Browse Source 
Removing this (system) database open from the later auth stack results
in a 15-30% improvement in different types of binds and on different
hardware (presumably better with slower disk speeds).

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Garming Sam
2019-05-08 12:40:48 +12:00
committed by Andrew Bartlett
parent ac9333cb91
commit 5841b164b2
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source4/ldap_server/ldap_server.c
View File

@ -1283,6 +1283,9 @@ static NTSTATUS ldapsrv_task_init(struct task_server *task)
/* register the server */ /* register the server */
irpc_add_name(task->msg_ctx, "ldap_server"); irpc_add_name(task->msg_ctx, "ldap_server");
task->private_data = ldap_service;
return NT_STATUS_OK; return NT_STATUS_OK;
failed: failed:
@ -1290,6 +1293,27 @@ failed:
return status; return status;
} }
/*
* Open a database to be later used by LDB wrap code (although it should be
* plumbed through correctly eventually).
*/
static void ldapsrv_post_fork(struct task_server *task, struct process_details *pd)
{
struct ldapsrv_service *ldap_service =
talloc_get_type_abort(task->private_data, struct ldapsrv_service);
ldap_service->sam_ctx = samdb_connect(ldap_service,
ldap_service->task->event_ctx,
ldap_service->task->lp_ctx,
system_session(ldap_service->task->lp_ctx),
NULL,
0);
if (ldap_service->sam_ctx == NULL) {
task_server_terminate(task, "Cannot open system session LDB",
true);
return;
}
}
NTSTATUS server_service_ldap_init(TALLOC_CTX *ctx) NTSTATUS server_service_ldap_init(TALLOC_CTX *ctx)
{ {
@ -1297,7 +1321,7 @@ NTSTATUS server_service_ldap_init(TALLOC_CTX *ctx)
.inhibit_fork_on_accept = false, .inhibit_fork_on_accept = false,
.inhibit_pre_fork = false, .inhibit_pre_fork = false,
.task_init = ldapsrv_task_init, .task_init = ldapsrv_task_init,
.post_fork = NULL .post_fork = ldapsrv_post_fork,
}; };
return register_server_service(ctx, "ldap", &details); return register_server_service(ctx, "ldap", &details);
} }

2
source4/ldap_server/ldap_server.h
View File

@ -100,6 +100,8 @@ struct ldapsrv_service {
uint64_t generation; uint64_t generation;
struct tevent_req *retry; struct tevent_req *retry;
} notification; } notification;
struct ldb_context *sam_ctx;
}; };
#include "ldap_server/proto.h" #include "ldap_server/proto.h"