Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
别团等shy哥发育
redis
提交
3e496833
R
redis
项目概览
别团等shy哥发育
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3e496833
编写于
2月 07, 2014
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Sentinel: allow SHUTDOWN command in Sentinel mode.
上级
301a0cfc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
6 deletion
+10
-6
src/db.c
src/db.c
+6
-4
src/redis.c
src/redis.c
+2
-1
src/sentinel.c
src/sentinel.c
+2
-1
未找到文件。
src/db.c
浏览文件 @
3e496833
...
...
@@ -595,11 +595,13 @@ void shutdownCommand(redisClient *c) {
return
;
}
}
/*
SHUTDOWN can be called even while the server is in "loading" state.
*
When this happens
we need to make sure no attempt is performed to save
/*
When SHUTDOWN is called while the server is loading a dataset in
*
memory
we need to make sure no attempt is performed to save
* the dataset on shutdown (otherwise it could overwrite the current DB
* with half-read data). */
if
(
server
.
loading
)
* with half-read data).
*
* Also when in Sentinel mode clear the SAVE flag and force NOSAVE. */
if
(
server
.
loading
||
server
.
sentinel_mode
)
flags
=
(
flags
&
~
REDIS_SHUTDOWN_SAVE
)
|
REDIS_SHUTDOWN_NOSAVE
;
if
(
prepareForShutdown
(
flags
)
==
REDIS_OK
)
exit
(
0
);
addReplyError
(
c
,
"Errors trying to SHUTDOWN. Check logs."
);
...
...
src/redis.c
浏览文件 @
3e496833
...
...
@@ -2080,7 +2080,8 @@ int prepareForShutdown(int flags) {
}
/* Close the listening sockets. Apparently this allows faster restarts. */
closeListeningSockets
(
1
);
redisLog
(
REDIS_WARNING
,
"Redis is now ready to exit, bye bye..."
);
redisLog
(
REDIS_WARNING
,
"%s is now ready to exit, bye bye..."
,
server
.
sentinel_mode
?
"Sentinel"
:
"Redis"
);
return
REDIS_OK
;
}
...
...
src/sentinel.c
浏览文件 @
3e496833
...
...
@@ -377,7 +377,8 @@ struct redisCommand sentinelcmds[] = {
{
"unsubscribe"
,
unsubscribeCommand
,
-
1
,
""
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"psubscribe"
,
psubscribeCommand
,
-
2
,
""
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"punsubscribe"
,
punsubscribeCommand
,
-
1
,
""
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"info"
,
sentinelInfoCommand
,
-
1
,
""
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
}
{
"info"
,
sentinelInfoCommand
,
-
1
,
""
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"shutdown"
,
shutdownCommand
,
-
1
,
""
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
}
};
/* This function overwrites a few normal Redis config default with Sentinel
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录