gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't support Gopher if enable io threads to read queries (#7851)

Browse Source 
There's currently an issue with IO threads and gopher (issuing lookupKey from within the thread).
simply fix is to just not support it for now.
This commit is contained in:
Wang Yuan 2020-09-27 17:35:16 +08:00 committed by GitHub
parent f1863a1fe7
commit c9f00bcce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
redis.conf
View File

@ -1538,8 +1538,11 @@ notify-keyspace-events ""
# #
# So use the 'requirepass' option to protect your instance. # So use the 'requirepass' option to protect your instance.
# #
# To enable Gopher support uncomment the following line and set # Note that Gopher is not currently supported when 'io-threads-do-reads'
# the option from no (the default) to yes. # is enabled.
#
# To enable Gopher support, uncomment the following line and set the option
# from no (the default) to yes.
# #
# gopher-enabled no # gopher-enabled no
@ -1879,4 +1882,3 @@ jemalloc-bg-thread yes
# #
# Set bgsave child process to cpu affinity 1,10,11 # Set bgsave child process to cpu affinity 1,10,11
# bgsave_cpulist 1,10-11 # bgsave_cpulist 1,10-11

5
src/networking.c
View File

@ -1919,8 +1919,9 @@ void processInputBuffer(client *c) {
if (c->reqtype == PROTO_REQ_INLINE) { if (c->reqtype == PROTO_REQ_INLINE) {
if (processInlineBuffer(c) != C_OK) break; if (processInlineBuffer(c) != C_OK) break;
/* If the Gopher mode and we got zero or one argument, process /* If the Gopher mode and we got zero or one argument, process
* the request in Gopher mode. */ * the request in Gopher mode. To avoid data race, Redis won't
if (server.gopher_enabled && * support Gopher if enable io threads to read queries. */
if (server.gopher_enabled && !server.io_threads_do_reads &&
((c->argc == 1 && ((char*)(c->argv[0]->ptr))[0] == '/') || ((c->argc == 1 && ((char*)(c->argv[0]->ptr))[0] == '/') ||
c->argc == 0)) c->argc == 0))
{ {