Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
别团等shy哥发育
redis
提交
0d7366c3
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,发现更多精彩内容 >>
提交
0d7366c3
编写于
1月 09, 2014
作者:
J
Jonathan Pickett
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
workaround for deadlocking on RDB file copy during multiple master/slave synchronizations
上级
8a47dc3c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
3 deletion
+30
-3
src/Win32_QFork.cpp
src/Win32_QFork.cpp
+1
-1
src/networking.c
src/networking.c
+6
-1
src/redis.h
src/redis.h
+1
-0
src/replication.c
src/replication.c
+22
-1
未找到文件。
src/Win32_QFork.cpp
浏览文件 @
0d7366c3
...
...
@@ -582,7 +582,7 @@ BOOL AbortForkOperation()
BOOL
EndForkOperation
()
{
try
{
#ifdef _DEBUG
printf
(
"
sending termi
ation signal
\n
"
);
printf
(
"
EndForkOperation: sending termin
ation signal
\n
"
);
#endif
SetEvent
(
g_pQForkControl
->
terminateForkedProcess
);
if
(
g_hForkedProcess
!=
0
)
...
...
src/networking.c
浏览文件 @
0d7366c3
...
...
@@ -671,8 +671,13 @@ void freeClient(redisClient *c) {
* Case 1: we lost the connection with a slave. */
if
(
c
->
flags
&
REDIS_SLAVE
)
{
list
*
l
;
if
(
c
->
replstate
==
REDIS_REPL_SEND_BULK
&&
c
->
repldbfd
!=
-
1
)
if
(
c
->
replstate
==
REDIS_REPL_SEND_BULK
&&
c
->
repldbfd
!=
-
1
)
{
close
(
c
->
repldbfd
);
#ifdef _WIN32
DeleteFileA
(
c
->
replFileCopy
);
memset
(
c
->
replFileCopy
,
0
,
MAX_PATH
);
#endif
}
l
=
(
c
->
flags
&
REDIS_MONITOR
)
?
server
.
monitors
:
server
.
slaves
;
ln
=
listSearchKey
(
l
,
c
);
redisAssert
(
ln
!=
NULL
);
...
...
src/redis.h
浏览文件 @
0d7366c3
...
...
@@ -411,6 +411,7 @@ typedef struct redisClient {
int
replstate
;
/* replication state if this is a slave */
int
repldbfd
;
/* replication DB file descriptor */
#ifdef _WIN32
char
replFileCopy
[
_MAX_PATH
];
long
long
repldboff
;
/* replication DB file offset */
long
long
repldbsize
;
/* replication DB file size */
#else
...
...
src/replication.c
浏览文件 @
0d7366c3
...
...
@@ -243,6 +243,10 @@ void sendBulkToSlaveDataDone(aeEventLoop *el, int fd, void *privdata, int nwritt
slave
->
repldboff
+=
nwritten
;
if
(
slave
->
repldboff
==
slave
->
repldbsize
)
{
close
(
slave
->
repldbfd
);
#ifdef _WIN32
DeleteFileA
(
slave
->
replFileCopy
);
memset
(
slave
->
replFileCopy
,
0
,
MAX_PATH
);
#endif
slave
->
repldbfd
=
-
1
;
aeDeleteFileEvent
(
server
.
el
,
slave
->
fd
,
AE_WRITABLE
);
slave
->
replstate
=
REDIS_REPL_ONLINE
;
...
...
@@ -343,6 +347,10 @@ void sendBulkToSlave(aeEventLoop *el, int fd, void *privdata, int mask) {
slave
->
repldboff
+=
nwritten
;
if
(
slave
->
repldboff
==
slave
->
repldbsize
)
{
close
(
slave
->
repldbfd
);
#ifdef _WIN32
DeleteFileA
(
slave
->
replFileCopy
);
memset
(
slave
->
replFileCopy
,
0
,
MAX_PATH
);
#endif
slave
->
repldbfd
=
-
1
;
aeDeleteFileEvent
(
server
.
el
,
slave
->
fd
,
AE_WRITABLE
);
slave
->
replstate
=
REDIS_REPL_ONLINE
;
...
...
@@ -383,7 +391,20 @@ void updateSlavesWaitingBgsave(int bgsaveerr) {
continue
;
}
#ifdef _WIN32
if
((
slave
->
repldbfd
=
open
(
server
.
rdb_filename
,
O_RDONLY
|
_O_BINARY
,
0
))
==
-
1
||
/* As multiple slaves join asynchronously with the master, the synchronization process can launch multiple
RDB background saves before the first slaves are fully synchronized. This can cause a race condition
for the RDB file produced by the forked process with the RDB file being used to feed the slaves.
I don't think this patch totally eliminates the race condition, but it does eliminate the deadlock
that occurs when the forked process tries to copy the file it produces over the the RDB file being
held open by the slave feeding code. */
sprintf
(
slave
->
replFileCopy
,
"%d_%s"
,
slave
->
fd
,
server
.
rdb_filename
);
if
(
CopyFileA
(
server
.
rdb_filename
,
slave
->
replFileCopy
,
FALSE
)
==
FALSE
)
{
freeClient
(
slave
);
redisLog
(
REDIS_WARNING
,
"Failed to duplicate RDB file. Failing SYNC: %d"
,
GetLastError
());
continue
;
}
if
((
slave
->
repldbfd
=
open
(
slave
->
replFileCopy
,
O_RDONLY
|
_O_BINARY
,
0
))
==
-
1
||
#else
if
((
slave
->
repldbfd
=
open
(
server
.
rdb_filename
,
O_RDONLY
))
==
-
1
||
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录