Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小问号你是否有许多朋友
Rocketmq
提交
155823ef
R
Rocketmq
项目概览
小问号你是否有许多朋友
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
155823ef
编写于
3月 18, 2017
作者:
Y
yukon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ROCKETMQ-145][HOTFIX] Resolve concureent issue in HAService and GroupCommitService
上级
ac8941b0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
47 addition
and
43 deletion
+47
-43
store/src/main/java/org/apache/rocketmq/store/CommitLog.java
store/src/main/java/org/apache/rocketmq/store/CommitLog.java
+28
-26
store/src/main/java/org/apache/rocketmq/store/ha/HAService.java
...src/main/java/org/apache/rocketmq/store/ha/HAService.java
+19
-17
未找到文件。
store/src/main/java/org/apache/rocketmq/store/CommitLog.java
浏览文件 @
155823ef
...
...
@@ -995,12 +995,12 @@ public class CommitLog {
private
volatile
List
<
GroupCommitRequest
>
requestsWrite
=
new
ArrayList
<
GroupCommitRequest
>();
private
volatile
List
<
GroupCommitRequest
>
requestsRead
=
new
ArrayList
<
GroupCommitRequest
>();
public
void
putRequest
(
final
GroupCommitRequest
request
)
{
synchronized
(
this
)
{
public
synchronized
void
putRequest
(
final
GroupCommitRequest
request
)
{
synchronized
(
this
.
requestsWrite
)
{
this
.
requestsWrite
.
add
(
request
);
if
(
hasNotified
.
compareAndSet
(
false
,
true
))
{
waitPoint
.
countDown
();
// notify
}
}
if
(
hasNotified
.
compareAndSet
(
false
,
true
))
{
waitPoint
.
countDown
();
// notify
}
}
...
...
@@ -1011,32 +1011,34 @@ public class CommitLog {
}
private
void
doCommit
()
{
if
(!
this
.
requestsRead
.
isEmpty
())
{
for
(
GroupCommitRequest
req
:
this
.
requestsRead
)
{
// There may be a message in the next file, so a maximum of
// two times the flush
boolean
flushOK
=
false
;
for
(
int
i
=
0
;
i
<
2
&&
!
flushOK
;
i
++)
{
flushOK
=
CommitLog
.
this
.
mappedFileQueue
.
getFlushedWhere
()
>=
req
.
getNextOffset
();
if
(!
flushOK
)
{
CommitLog
.
this
.
mappedFileQueue
.
flush
(
0
);
synchronized
(
this
.
requestsRead
)
{
if
(!
this
.
requestsRead
.
isEmpty
())
{
for
(
GroupCommitRequest
req
:
this
.
requestsRead
)
{
// There may be a message in the next file, so a maximum of
// two times the flush
boolean
flushOK
=
false
;
for
(
int
i
=
0
;
i
<
2
&&
!
flushOK
;
i
++)
{
flushOK
=
CommitLog
.
this
.
mappedFileQueue
.
getFlushedWhere
()
>=
req
.
getNextOffset
();
if
(!
flushOK
)
{
CommitLog
.
this
.
mappedFileQueue
.
flush
(
0
);
}
}
req
.
wakeupCustomer
(
flushOK
);
}
req
.
wakeupCustomer
(
flushOK
);
}
long
storeTimestamp
=
CommitLog
.
this
.
mappedFileQueue
.
getStoreTimestamp
();
if
(
storeTimestamp
>
0
)
{
CommitLog
.
this
.
defaultMessageStore
.
getStoreCheckpoint
().
setPhysicMsgTimestamp
(
storeTimestamp
);
}
long
storeTimestamp
=
CommitLog
.
this
.
mappedFileQueue
.
getStoreTimestamp
();
if
(
storeTimestamp
>
0
)
{
CommitLog
.
this
.
defaultMessageStore
.
getStoreCheckpoint
().
setPhysicMsgTimestamp
(
storeTimestamp
);
this
.
requestsRead
.
clear
();
}
else
{
// Because of individual messages is set to not sync flush, it
// will come to this process
CommitLog
.
this
.
mappedFileQueue
.
flush
(
0
);
}
this
.
requestsRead
.
clear
();
}
else
{
// Because of individual messages is set to not sync flush, it
// will come to this process
CommitLog
.
this
.
mappedFileQueue
.
flush
(
0
);
}
}
...
...
store/src/main/java/org/apache/rocketmq/store/ha/HAService.java
浏览文件 @
155823ef
...
...
@@ -253,12 +253,12 @@ public class HAService {
private
volatile
List
<
CommitLog
.
GroupCommitRequest
>
requestsWrite
=
new
ArrayList
<>();
private
volatile
List
<
CommitLog
.
GroupCommitRequest
>
requestsRead
=
new
ArrayList
<>();
public
void
putRequest
(
final
CommitLog
.
GroupCommitRequest
request
)
{
synchronized
(
this
)
{
public
synchronized
void
putRequest
(
final
CommitLog
.
GroupCommitRequest
request
)
{
synchronized
(
this
.
requestsWrite
)
{
this
.
requestsWrite
.
add
(
request
);
if
(
hasNotified
.
compareAndSet
(
false
,
true
))
{
waitPoint
.
countDown
();
// notify
}
}
if
(
hasNotified
.
compareAndSet
(
false
,
true
))
{
waitPoint
.
countDown
();
// notify
}
}
...
...
@@ -273,22 +273,24 @@ public class HAService {
}
private
void
doWaitTransfer
()
{
if
(!
this
.
requestsRead
.
isEmpty
())
{
for
(
CommitLog
.
GroupCommitRequest
req
:
this
.
requestsRead
)
{
boolean
transferOK
=
HAService
.
this
.
push2SlaveMaxOffset
.
get
()
>=
req
.
getNextOffset
();
for
(
int
i
=
0
;
!
transferOK
&&
i
<
5
;
i
++)
{
this
.
notifyTransferObject
.
waitForRunning
(
1000
);
transferOK
=
HAService
.
this
.
push2SlaveMaxOffset
.
get
()
>=
req
.
getNextOffset
();
}
synchronized
(
this
.
requestsRead
)
{
if
(!
this
.
requestsRead
.
isEmpty
())
{
for
(
CommitLog
.
GroupCommitRequest
req
:
this
.
requestsRead
)
{
boolean
transferOK
=
HAService
.
this
.
push2SlaveMaxOffset
.
get
()
>=
req
.
getNextOffset
();
for
(
int
i
=
0
;
!
transferOK
&&
i
<
5
;
i
++)
{
this
.
notifyTransferObject
.
waitForRunning
(
1000
);
transferOK
=
HAService
.
this
.
push2SlaveMaxOffset
.
get
()
>=
req
.
getNextOffset
();
}
if
(!
transferOK
)
{
log
.
warn
(
"transfer messsage to slave timeout, "
+
req
.
getNextOffset
());
if
(!
transferOK
)
{
log
.
warn
(
"transfer messsage to slave timeout, "
+
req
.
getNextOffset
());
}
req
.
wakeupCustomer
(
transferOK
);
}
req
.
wakeupCustomer
(
transferOK
);
this
.
requestsRead
.
clear
(
);
}
this
.
requestsRead
.
clear
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录