Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Turbo码先生
redis
提交
7c9f6ebc
R
redis
项目概览
Turbo码先生
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
7c9f6ebc
编写于
7月 10, 2019
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Diskless replica: fix disklessLoadRestoreBackups() bug.
上级
3bbb9a14
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
7 deletion
+7
-7
src/replication.c
src/replication.c
+7
-7
未找到文件。
src/replication.c
浏览文件 @
7c9f6ebc
...
...
@@ -1138,16 +1138,16 @@ redisDb *disklessLoadMakeBackups(void) {
*
* If the socket loading went wrong, we want to restore the old backups
* into the server databases. This function does just that in the case
* the '
count
' argument (the number of DBs to replace) is non-zero.
* the '
restore
' argument (the number of DBs to replace) is non-zero.
*
* When instead the loading succeeded we want just to free our old backups,
* in that case the funciton will do just that when '
count
' is 0. */
void
disklessLoadRestoreBackups
(
redisDb
*
backup
,
int
count
,
int
empty_db_flags
)
* in that case the funciton will do just that when '
restore
' is 0. */
void
disklessLoadRestoreBackups
(
redisDb
*
backup
,
int
restore
,
int
empty_db_flags
)
{
if
(
count
)
{
if
(
restore
)
{
/* Restore. */
emptyDbGeneric
(
server
.
db
,
-
1
,
empty_db_flags
,
replicationEmptyDbCallback
);
for
(
int
i
=
0
;
i
<
count
;
i
++
)
{
for
(
int
i
=
0
;
i
<
server
.
dbnum
;
i
++
)
{
dictRelease
(
server
.
db
[
i
].
dict
);
dictRelease
(
server
.
db
[
i
].
expires
);
server
.
db
[
i
]
=
backup
[
i
];
...
...
@@ -1155,7 +1155,7 @@ void disklessLoadRestoreBackups(redisDb *backup, int count, int empty_db_flags)
}
else
{
/* Delete. */
emptyDbGeneric
(
backup
,
-
1
,
empty_db_flags
,
replicationEmptyDbCallback
);
for
(
int
i
=
0
;
i
<
count
;
i
++
)
{
for
(
int
i
=
0
;
i
<
server
.
dbnum
;
i
++
)
{
dictRelease
(
backup
[
i
].
dict
);
dictRelease
(
backup
[
i
].
expires
);
}
...
...
@@ -1382,7 +1382,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
rioFreeFd
(
&
rdb
,
NULL
);
if
(
server
.
repl_diskless_load
==
REPL_DISKLESS_LOAD_SWAPDB
)
{
/* Restore the backed up databases. */
disklessLoadRestoreBackups
(
diskless_load_backup
,
server
.
dbnum
,
disklessLoadRestoreBackups
(
diskless_load_backup
,
1
,
empty_db_flags
);
}
else
{
/* Remove the half-loaded data in case we started with
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录