Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
094b4739
Unverified
Commit
094b4739
authored
Apr 06, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 06, 2020
Browse files
Merge pull request #6243 from soloestoy/expand-lazy-free-server-del
lazyfree: add a new configuration lazyfree-lazy-user-del
parents
121c51f4
3c0ed030
Changes
4
Hide whitespace changes
Inline
Side-by-side
redis.conf
View file @
094b4739
...
@@ -936,7 +936,9 @@ replica-priority 100
...
@@ -936,7 +936,9 @@ replica-priority 100
# or SORT with STORE option may delete existing keys. The SET command
# or SORT with STORE option may delete existing keys. The SET command
# itself removes any old content of the specified key in order to replace
# itself removes any old content of the specified key in order to replace
# it with the specified string.
# it with the specified string.
# 4) During replication, when a replica performs a full resynchronization with
# 4) The DEL command itself, and normally it's not easy to replace DEL with
# UNLINK in user's codes.
# 5) During replication, when a replica performs a full resynchronization with
# its master, the content of the whole database is removed in order to
# its master, the content of the whole database is removed in order to
# load the RDB file just transferred.
# load the RDB file just transferred.
#
#
...
@@ -948,6 +950,7 @@ replica-priority 100
...
@@ -948,6 +950,7 @@ replica-priority 100
lazyfree
-
lazy
-
eviction
no
lazyfree
-
lazy
-
eviction
no
lazyfree
-
lazy
-
expire
no
lazyfree
-
lazy
-
expire
no
lazyfree
-
lazy
-
server
-
del
no
lazyfree
-
lazy
-
server
-
del
no
lazyfree
-
lazy
-
user
-
del
no
replica
-
lazy
-
flush
no
replica
-
lazy
-
flush
no
################################ THREADED I/O #################################
################################ THREADED I/O #################################
...
...
src/config.c
View file @
094b4739
...
@@ -2099,6 +2099,7 @@ standardConfig configs[] = {
...
@@ -2099,6 +2099,7 @@ standardConfig configs[] = {
createBoolConfig
(
"lazyfree-lazy-eviction"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
lazyfree_lazy_eviction
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"lazyfree-lazy-eviction"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
lazyfree_lazy_eviction
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"lazyfree-lazy-expire"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
lazyfree_lazy_expire
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"lazyfree-lazy-expire"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
lazyfree_lazy_expire
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"lazyfree-lazy-server-del"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
lazyfree_lazy_server_del
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"lazyfree-lazy-server-del"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
lazyfree_lazy_server_del
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"lazyfree-lazy-user-del"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
lazyfree_lazy_user_del
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"repl-disable-tcp-nodelay"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
repl_disable_tcp_nodelay
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"repl-disable-tcp-nodelay"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
repl_disable_tcp_nodelay
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"repl-diskless-sync"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
repl_diskless_sync
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"repl-diskless-sync"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
repl_diskless_sync
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"gopher-enabled"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
gopher_enabled
,
0
,
NULL
,
NULL
),
createBoolConfig
(
"gopher-enabled"
,
NULL
,
MODIFIABLE_CONFIG
,
server
.
gopher_enabled
,
0
,
NULL
,
NULL
),
...
...
src/db.c
View file @
094b4739
...
@@ -556,7 +556,7 @@ void delGenericCommand(client *c, int lazy) {
...
@@ -556,7 +556,7 @@ void delGenericCommand(client *c, int lazy) {
}
}
void
delCommand
(
client
*
c
)
{
void
delCommand
(
client
*
c
)
{
delGenericCommand
(
c
,
0
);
delGenericCommand
(
c
,
server
.
lazyfree_lazy_user_del
);
}
}
void
unlinkCommand
(
client
*
c
)
{
void
unlinkCommand
(
client
*
c
)
{
...
...
src/server.h
View file @
094b4739
...
@@ -1397,6 +1397,7 @@ struct redisServer {
...
@@ -1397,6 +1397,7 @@ struct redisServer {
int
lazyfree_lazy_eviction
;
int
lazyfree_lazy_eviction
;
int
lazyfree_lazy_expire
;
int
lazyfree_lazy_expire
;
int
lazyfree_lazy_server_del
;
int
lazyfree_lazy_server_del
;
int
lazyfree_lazy_user_del
;
/* Latency monitor */
/* Latency monitor */
long
long
latency_monitor_threshold
;
long
long
latency_monitor_threshold
;
dict
*
latency_events
;
dict
*
latency_events
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment