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

s3: smbd: Change aio_pending_size static variable to a new "aio max threads" smb.conf parameter.

Browse Source 
Removes accessor functions as now this parameter is set
under user control in smb.conf. Default is 100.

Note that this doesn't limit the number of outstanding
aio requests, it just causes them to go onto the
pthreadpool queue.

Now we need to prioritize pthreadpool pipe replies
ahead of incoming SMB2 requests, but that's a patch
for another day.

Based on ideas from Volker.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Jeremy Allison 2015-11-12 13:23:30 -08:00
parent c83ecbb51b
commit c4be0b7ff4
9 changed files with 28 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs-xml/smbdotconf/tuning/aiomaxthreads.xml Normal file
View File

@ -0,0 +1,19 @@
<samba:parameter name="aio max threads"
type="integer"
context="G"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
The integer parameter specifies the maximum number of
threads each smbd process will create when doing parallel asynchronous IO
calls. If the number of outstanding calls is greater than this
number the requests will not be refused but go onto a queue
and will be scheduled in turn as outstanding requests complete.
</para>
<related>aio read size</related>
<related>aio write size</related>
</description>
<value type="default">100</value>
</samba:parameter>

2
lib/param/loadparm.c
View File

@ -2809,6 +2809,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "printjob username", "%U");
lpcfg_do_global_parameter(lp_ctx, "aio max threads", "100");
/* Allow modules to adjust defaults */
for (defaults_hook = defaults_hooks; defaults_hook;
defaults_hook = defaults_hook->next) {

11
source3/modules/vfs_aio_fork.c
View File

@ -899,17 +899,6 @@ static int aio_fork_connect(vfs_handle_struct *handle, const char *service,
NULL, struct aio_fork_config,
return -1);
/*********************************************************************
* How many threads to initialize ?
* 100 per process seems insane as a default until you realize that
* (a) Threads terminate after 1 second when idle.
* (b) Throttling is done in SMB2 via the crediting algorithm.
* (c) SMB1 clients are limited to max_mux (50) outstanding
* requests and Windows clients don't use this anyway.
* Essentially we want this to be unlimited unless smb.conf
* says different.
*********************************************************************/
set_aio_pending_size(100);
return 0;
}

22
source3/modules/vfs_aio_linux.c
View File

@ -113,12 +113,12 @@ static bool init_aio_linux(struct vfs_handle_struct *handle)
goto fail;
}
if (io_queue_init(get_aio_pending_size(), &io_ctx)) {
if (io_queue_init(lp_aio_max_threads(), &io_ctx)) {
goto fail;
}
DEBUG(10,("init_aio_linux: initialized with up to %d events\n",
get_aio_pending_size()));
(int)lp_aio_max_threads()));
return true;
@ -321,25 +321,7 @@ static int aio_linux_int_recv(struct tevent_req *req, int *err)
return aio_linux_recv(req, err);
}
static int aio_linux_connect(vfs_handle_struct *handle, const char *service,
const char *user)
{
/*********************************************************************
* How many io_events to initialize ?
* 128 per process seems insane as a default until you realize that
* (a) Throttling is done in SMB2 via the crediting algorithm.
* (b) SMB1 clients are limited to max_mux (50) outstanding
* requests and Windows clients don't use this anyway.
* Essentially we want this to be unlimited unless smb.conf
* says different.
*********************************************************************/
set_aio_pending_size(lp_parm_int(
SNUM(handle->conn), "aio_linux", "aio num events", 128));
return SMB_VFS_NEXT_CONNECT(handle, service, user);
}
static struct vfs_fn_pointers vfs_aio_linux_fns = {
.connect_fn = aio_linux_connect,
.pread_send_fn = aio_linux_pread_send,
.pread_recv_fn = aio_linux_recv,
.pwrite_send_fn = aio_linux_pwrite_send,

4
source3/modules/vfs_aio_pthread.c
View File

@ -51,7 +51,7 @@ static bool init_aio_threadpool(struct tevent_context *ev_ctx,
return true;
}
ret = pthreadpool_init(get_aio_pending_size(), pp_pool);
ret = pthreadpool_init(lp_aio_max_threads(), pp_pool);
if (ret) {
errno = ret;
return false;
@ -69,7 +69,7 @@ static bool init_aio_threadpool(struct tevent_context *ev_ctx,
}
DEBUG(10,("init_aio_threadpool: initialized with up to %d threads\n",
get_aio_pending_size()));
(int)lp_aio_max_threads()));
return true;
}

2
source3/modules/vfs_default.c
View File

@ -716,7 +716,7 @@ static bool vfswrap_init_asys_ctx(struct smbd_server_connection *conn)
return true;
}
ret = asys_context_init(&ctx, get_aio_pending_size());
ret = asys_context_init(&ctx, lp_aio_max_threads());
if (ret != 0) {
DEBUG(1, ("asys_context_init failed: %s\n", strerror(ret)));
return false;

2
source3/param/loadparm.c
View File

@ -917,6 +917,8 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
Globals.web_port = 901;
Globals.aio_max_threads = 100;
/* Now put back the settings that were set with lp_set_cmdline() */
apply_lp_set_cmdline();
}

11
source3/smbd/aio.c
View File

@ -29,19 +29,8 @@
Statics plus accessor functions.
*****************************************************************************/
static int aio_pending_size = 100; /* Current max threads. */
static int outstanding_aio_calls;
int get_aio_pending_size(void)
{
return aio_pending_size;
}
void set_aio_pending_size(int newsize)
{
aio_pending_size = newsize;
}
int get_outstanding_aio_calls(void)
{
return outstanding_aio_calls;

2
source3/smbd/proto.h
View File

@ -66,8 +66,6 @@ void srv_set_signing(struct smbXsrv_connection *conn,
/* The following definitions come from smbd/aio.c */
int get_aio_pending_size(void);
void set_aio_pending_size(int newsize);
int get_outstanding_aio_calls(void);
void increment_outstanding_aio_calls(void);
void decrement_outstanding_aio_calls(void);