diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-28 15:59:38 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-07-30 10:17:45 +0200 |
| commit | 71015d844e3f25a0c4eada9827a1dad464a4fdce (patch) | |
| tree | 559fad43bb05477098b15df4476c5ccfd3135c0d /include | |
| parent | 34f2be3b296fdd5933687eda9c3ef3ba9f707261 (diff) | |
| download | mariadb-git-71015d844e3f25a0c4eada9827a1dad464a4fdce.tar.gz | |
MDEV-21101 unexpected wait_timeout with pool-of-threads
Due to restricted size of the threadpool, execution of client queries can
be delayed (queued) for a while. This delay was interpreted as client
inactivity, and connection is closed, if client idle time + queue time
exceeds wait_timeout.
But users did not expect queue time to be included into wait_timeout.
This patch changes the behavior. We don't close connection anymore,
if there is some unread data present on connection,
even if wait_timeout is exceeded. Unread data means that client
was not idle, it sent a query, which we did not have time to process yet.
Diffstat (limited to 'include')
| -rw-r--r-- | include/violite.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/violite.h b/include/violite.h index 6808a9776de..5bc6359b153 100644 --- a/include/violite.h +++ b/include/violite.h @@ -110,9 +110,7 @@ my_bool vio_peer_addr(Vio *vio, char *buf, uint16 *port, size_t buflen); /* Wait for an I/O event notification. */ int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout); my_bool vio_is_connected(Vio *vio); -#ifndef DBUG_OFF ssize_t vio_pending(Vio *vio); -#endif /* Set timeout for a network operation. */ extern int vio_timeout(Vio *vio, uint which, int timeout_sec); extern void vio_set_wait_callback(void (*before_wait)(void), |