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
7b9fc6fc
Commit
7b9fc6fc
authored
Jul 11, 2022
by
Oran Agra
Browse files
Merge 'origin/unstable' into 7.0 for 7.0.3
parents
05833959
693acc01
Changes
84
Show whitespace changes
Inline
Side-by-side
src/commands/client-no-evict.json
View file @
7b9fc6fc
...
...
@@ -11,7 +11,8 @@
"ADMIN"
,
"NOSCRIPT"
,
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/client-pause.json
View file @
7b9fc6fc
...
...
@@ -17,7 +17,8 @@
"ADMIN"
,
"NOSCRIPT"
,
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/client-reply.json
View file @
7b9fc6fc
...
...
@@ -10,7 +10,8 @@
"command_flags"
:
[
"NOSCRIPT"
,
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/client-setname.json
View file @
7b9fc6fc
...
...
@@ -10,7 +10,8 @@
"command_flags"
:
[
"NOSCRIPT"
,
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/client-tracking.json
View file @
7b9fc6fc
...
...
@@ -10,7 +10,8 @@
"command_flags"
:
[
"NOSCRIPT"
,
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/client-trackinginfo.json
View file @
7b9fc6fc
...
...
@@ -10,7 +10,8 @@
"command_flags"
:
[
"NOSCRIPT"
,
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/client-unblock.json
View file @
7b9fc6fc
...
...
@@ -11,7 +11,8 @@
"ADMIN"
,
"NOSCRIPT"
,
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/client-unpause.json
View file @
7b9fc6fc
...
...
@@ -11,7 +11,8 @@
"ADMIN"
,
"NOSCRIPT"
,
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/cluster-meet.json
View file @
7b9fc6fc
...
...
@@ -7,6 +7,12 @@
"arity"
:
-4
,
"container"
:
"CLUSTER"
,
"function"
:
"clusterCommand"
,
"history"
:
[
[
"4.0.0"
,
"Added the optional `cluster_bus_port` argument."
]
],
"command_flags"
:
[
"NO_ASYNC_LOADING"
,
"ADMIN"
,
...
...
@@ -23,6 +29,12 @@
{
"name"
:
"port"
,
"type"
:
"integer"
},
{
"name"
:
"cluster_bus_port"
,
"type"
:
"integer"
,
"optional"
:
true
,
"since"
:
"4.0.0"
}
]
}
...
...
src/commands/cluster-reset.json
View file @
7b9fc6fc
...
...
@@ -4,7 +4,7 @@
"complexity"
:
"O(N) where N is the number of known nodes. The command may execute a FLUSHALL as a side effect."
,
"group"
:
"cluster"
,
"since"
:
"3.0.0"
,
"arity"
:
3
,
"arity"
:
-2
,
"container"
:
"CLUSTER"
,
"function"
:
"clusterCommand"
,
"command_flags"
:
[
...
...
src/commands/command-count.json
View file @
7b9fc6fc
...
...
@@ -9,7 +9,8 @@
"function"
:
"commandCountCommand"
,
"command_flags"
:
[
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/command-docs.json
View file @
7b9fc6fc
...
...
@@ -9,7 +9,8 @@
"function"
:
"commandDocsCommand"
,
"command_flags"
:
[
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/command-getkeys.json
View file @
7b9fc6fc
...
...
@@ -9,7 +9,8 @@
"function"
:
"commandGetKeysCommand"
,
"command_flags"
:
[
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/command-getkeysandflags.json
View file @
7b9fc6fc
...
...
@@ -9,7 +9,8 @@
"function"
:
"commandGetKeysAndFlagsCommand"
,
"command_flags"
:
[
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/command-help.json
View file @
7b9fc6fc
...
...
@@ -9,7 +9,8 @@
"function"
:
"commandHelpCommand"
,
"command_flags"
:
[
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/command-info.json
View file @
7b9fc6fc
...
...
@@ -15,7 +15,8 @@
],
"command_flags"
:
[
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/command-list.json
View file @
7b9fc6fc
...
...
@@ -9,7 +9,8 @@
"function"
:
"commandListCommand"
,
"command_flags"
:
[
"LOADING"
,
"STALE"
"STALE"
,
"SENTINEL"
],
"acl_categories"
:
[
"CONNECTION"
...
...
src/commands/echo.json
View file @
7b9fc6fc
...
...
@@ -7,6 +7,8 @@
"arity"
:
2
,
"function"
:
"echoCommand"
,
"command_flags"
:
[
"LOADING"
,
"STALE"
,
"FAST"
],
"acl_categories"
:
[
...
...
src/commands/zrange.json
View file @
7b9fc6fc
...
...
@@ -45,11 +45,11 @@
"key_spec_index"
:
0
},
{
"name"
:
"
min
"
,
"name"
:
"
start
"
,
"type"
:
"string"
},
{
"name"
:
"
max
"
,
"name"
:
"
stop
"
,
"type"
:
"string"
},
{
...
...
src/config.c
View file @
7b9fc6fc
...
...
@@ -1665,6 +1665,7 @@ int rewriteConfigOverwriteFile(char *configfile, sds content) {
const
char
*
tmp_suffix
=
".XXXXXX"
;
size_t
offset
=
0
;
ssize_t
written_bytes
=
0
;
int
old_errno
;
int
tmp_path_len
=
snprintf
(
tmp_conffile
,
sizeof
(
tmp_conffile
),
"%s%s"
,
configfile
,
tmp_suffix
);
if
(
tmp_path_len
<=
0
||
(
unsigned
int
)
tmp_path_len
>=
sizeof
(
tmp_conffile
))
{
...
...
@@ -1701,14 +1702,18 @@ int rewriteConfigOverwriteFile(char *configfile, sds content) {
serverLog
(
LL_WARNING
,
"Could not chmod config file (%s)"
,
strerror
(
errno
));
else
if
(
rename
(
tmp_conffile
,
configfile
)
==
-
1
)
serverLog
(
LL_WARNING
,
"Could not rename tmp config file (%s)"
,
strerror
(
errno
));
else
if
(
fsyncFileDir
(
configfile
)
==
-
1
)
serverLog
(
LL_WARNING
,
"Could not sync config file dir (%s)"
,
strerror
(
errno
));
else
{
retval
=
0
;
serverLog
(
LL_DEBUG
,
"Rewritten config file (%s) successfully"
,
configfile
);
}
cleanup:
old_errno
=
errno
;
close
(
fd
);
if
(
retval
)
unlink
(
tmp_conffile
);
errno
=
old_errno
;
return
retval
;
}
...
...
Prev
1
2
3
4
5
Next
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