Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Rocketmq
提交
c6741374
R
Rocketmq
项目概览
wmsofts
/
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,发现更多精彩内容 >>
提交
c6741374
编写于
12月 13, 2017
作者:
Z
Zhendong Liu
提交者:
von gosling
12月 13, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ROCKETMQ-320]Message loss when shutdown with dispatch behind (#197)
上级
54592158
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
80 addition
and
1 deletion
+80
-1
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
...n/java/org/apache/rocketmq/store/DefaultMessageStore.java
+4
-1
store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreShuwDownTest.java
...pache/rocketmq/store/DefaultMessageStoreShuwDownTest.java
+76
-0
未找到文件。
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
浏览文件 @
c6741374
...
...
@@ -110,6 +110,8 @@ public class DefaultMessageStore implements MessageStore {
private
FileLock
lock
;
boolean
shutDownNormal
=
false
;
public
DefaultMessageStore
(
final
MessageStoreConfig
messageStoreConfig
,
final
BrokerStatsManager
brokerStatsManager
,
final
MessageArrivingListener
messageArrivingListener
,
final
BrokerConfig
brokerConfig
)
throws
IOException
{
this
.
messageArrivingListener
=
messageArrivingListener
;
...
...
@@ -265,8 +267,9 @@ public class DefaultMessageStore implements MessageStore {
this
.
storeCheckpoint
.
flush
();
this
.
storeCheckpoint
.
shutdown
();
if
(
this
.
runningFlags
.
isWriteable
())
{
if
(
this
.
runningFlags
.
isWriteable
()
&&
dispatchBehindBytes
()
==
0
)
{
this
.
deleteFile
(
StorePathConfigHelper
.
getAbortFile
(
this
.
messageStoreConfig
.
getStorePathRootDir
()));
shutDownNormal
=
true
;
}
else
{
log
.
warn
(
"the store may be wrong, so shutdown abnormally, and keep abort file."
);
}
...
...
store/src/test/java/org/apache/rocketmq/store/DefaultMessageStoreShuwDownTest.java
0 → 100644
浏览文件 @
c6741374
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.rocketmq.store
;
import
java.io.File
;
import
org.apache.rocketmq.common.BrokerConfig
;
import
org.apache.rocketmq.common.UtilAll
;
import
org.apache.rocketmq.store.config.FlushDiskType
;
import
org.apache.rocketmq.store.config.MessageStoreConfig
;
import
org.apache.rocketmq.store.config.StorePathConfigHelper
;
import
org.apache.rocketmq.store.stats.BrokerStatsManager
;
import
org.junit.After
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.mockito.junit.MockitoJUnitRunner
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
mockito
.
Mockito
.
spy
;
import
static
org
.
mockito
.
Mockito
.
when
;
@RunWith
(
MockitoJUnitRunner
.
class
)
public
class
DefaultMessageStoreShuwDownTest
{
private
DefaultMessageStore
messageStore
;
@Before
public
void
init
()
throws
Exception
{
messageStore
=
spy
(
buildMessageStore
());
boolean
load
=
messageStore
.
load
();
when
(
messageStore
.
dispatchBehindBytes
()).
thenReturn
(
100L
);
assertTrue
(
load
);
messageStore
.
start
();
}
@Test
public
void
testDispatchBehindWhenShutDown
()
{
messageStore
.
shutdown
();
assertTrue
(!
messageStore
.
shutDownNormal
);
File
file
=
new
File
(
StorePathConfigHelper
.
getAbortFile
(
messageStore
.
getMessageStoreConfig
().
getStorePathRootDir
()));
assertTrue
(
file
.
exists
());
}
@After
public
void
destory
()
{
messageStore
.
destroy
();
File
file
=
new
File
(
messageStore
.
getMessageStoreConfig
().
getStorePathRootDir
());
UtilAll
.
deleteFile
(
file
);
}
public
DefaultMessageStore
buildMessageStore
()
throws
Exception
{
MessageStoreConfig
messageStoreConfig
=
new
MessageStoreConfig
();
messageStoreConfig
.
setMapedFileSizeCommitLog
(
1024
*
1024
*
10
);
messageStoreConfig
.
setMapedFileSizeConsumeQueue
(
1024
*
1024
*
10
);
messageStoreConfig
.
setMaxHashSlotNum
(
10000
);
messageStoreConfig
.
setMaxIndexNum
(
100
*
100
);
messageStoreConfig
.
setFlushDiskType
(
FlushDiskType
.
SYNC_FLUSH
);
return
new
DefaultMessageStore
(
messageStoreConfig
,
new
BrokerStatsManager
(
"simpleTest"
),
null
,
new
BrokerConfig
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录