Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
十年彩虹
Rocketmq
提交
97322eaf
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,发现更多精彩内容 >>
提交
97322eaf
编写于
3月 28, 2018
作者:
王
王松松
提交者:
Li Zhanhui
5月 28, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Concurrent issue of StoreStatsService
上级
2047f94d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
101 addition
and
4 deletion
+101
-4
store/src/main/java/org/apache/rocketmq/store/StoreStatsService.java
...ain/java/org/apache/rocketmq/store/StoreStatsService.java
+11
-4
store/src/test/java/org/apache/rocketmq/store/StoreStatsServiceTest.java
...java/org/apache/rocketmq/store/StoreStatsServiceTest.java
+90
-0
未找到文件。
store/src/main/java/org/apache/rocketmq/store/StoreStatsService.java
浏览文件 @
97322eaf
...
...
@@ -21,6 +21,7 @@ import java.util.HashMap;
import
java.util.LinkedList
;
import
java.util.Map
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ConcurrentMap
;
import
java.util.concurrent.atomic.AtomicLong
;
import
java.util.concurrent.locks.ReentrantLock
;
import
org.apache.rocketmq.common.ServiceThread
;
...
...
@@ -42,9 +43,9 @@ public class StoreStatsService extends ServiceThread {
private
final
AtomicLong
putMessageFailedTimes
=
new
AtomicLong
(
0
);
private
final
Map
<
String
,
AtomicLong
>
putMessageTopicTimesTotal
=
private
final
Concurrent
Map
<
String
,
AtomicLong
>
putMessageTopicTimesTotal
=
new
ConcurrentHashMap
<
String
,
AtomicLong
>(
128
);
private
final
Map
<
String
,
AtomicLong
>
putMessageTopicSizeTotal
=
private
final
Concurrent
Map
<
String
,
AtomicLong
>
putMessageTopicSizeTotal
=
new
ConcurrentHashMap
<
String
,
AtomicLong
>(
128
);
private
final
AtomicLong
getMessageTimesTotalFound
=
new
AtomicLong
(
0
);
...
...
@@ -545,7 +546,10 @@ public class StoreStatsService extends ServiceThread {
AtomicLong
rs
=
putMessageTopicSizeTotal
.
get
(
topic
);
if
(
null
==
rs
)
{
rs
=
new
AtomicLong
(
0
);
putMessageTopicSizeTotal
.
put
(
topic
,
rs
);
AtomicLong
previous
=
putMessageTopicSizeTotal
.
putIfAbsent
(
topic
,
rs
);
if
(
previous
!=
null
)
{
rs
=
previous
;
}
}
return
rs
;
}
...
...
@@ -554,7 +558,10 @@ public class StoreStatsService extends ServiceThread {
AtomicLong
rs
=
putMessageTopicTimesTotal
.
get
(
topic
);
if
(
null
==
rs
)
{
rs
=
new
AtomicLong
(
0
);
putMessageTopicTimesTotal
.
put
(
topic
,
rs
);
AtomicLong
previous
=
putMessageTopicTimesTotal
.
putIfAbsent
(
topic
,
rs
);
if
(
previous
!=
null
)
{
rs
=
previous
;
}
}
return
rs
;
}
...
...
store/src/test/java/org/apache/rocketmq/store/StoreStatsServiceTest.java
0 → 100644
浏览文件 @
97322eaf
/*
* 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.util.concurrent.BrokenBarrierException
;
import
java.util.concurrent.CountDownLatch
;
import
java.util.concurrent.CyclicBarrier
;
import
java.util.concurrent.atomic.AtomicLong
;
import
java.util.concurrent.atomic.AtomicReference
;
import
org.junit.Test
;
public
class
StoreStatsServiceTest
{
@Test
public
void
getSinglePutMessageTopicSizeTotal
()
throws
Exception
{
final
StoreStatsService
storeStatsService
=
new
StoreStatsService
();
int
num
=
Runtime
.
getRuntime
().
availableProcessors
()
*
2
;
for
(
int
j
=
0
;
j
<
100
;
j
++)
{
final
AtomicReference
<
AtomicLong
>
reference
=
new
AtomicReference
<>(
null
);
final
CountDownLatch
latch
=
new
CountDownLatch
(
num
);
final
CyclicBarrier
barrier
=
new
CyclicBarrier
(
num
);
for
(
int
i
=
0
;
i
<
num
;
i
++)
{
new
Thread
(
new
Runnable
()
{
@Override
public
void
run
()
{
try
{
barrier
.
await
();
AtomicLong
atomicLong
=
storeStatsService
.
getSinglePutMessageTopicSizeTotal
(
"test"
);
if
(
reference
.
compareAndSet
(
null
,
atomicLong
))
{
}
else
if
(
reference
.
get
()
!=
atomicLong
)
{
throw
new
RuntimeException
(
"Reference should be same!"
);
}
}
catch
(
InterruptedException
|
BrokenBarrierException
e
)
{
e
.
printStackTrace
();
}
finally
{
latch
.
countDown
();
}
}
}).
start
();
}
latch
.
await
();
}
}
@Test
public
void
getSinglePutMessageTopicTimesTotal
()
throws
Exception
{
final
StoreStatsService
storeStatsService
=
new
StoreStatsService
();
int
num
=
Runtime
.
getRuntime
().
availableProcessors
()
*
2
;
for
(
int
j
=
0
;
j
<
100
;
j
++)
{
final
AtomicReference
<
AtomicLong
>
reference
=
new
AtomicReference
<>(
null
);
final
CountDownLatch
latch
=
new
CountDownLatch
(
num
);
final
CyclicBarrier
barrier
=
new
CyclicBarrier
(
num
);
for
(
int
i
=
0
;
i
<
num
;
i
++)
{
new
Thread
(
new
Runnable
()
{
@Override
public
void
run
()
{
try
{
barrier
.
await
();
AtomicLong
atomicLong
=
storeStatsService
.
getSinglePutMessageTopicTimesTotal
(
"test"
);
if
(
reference
.
compareAndSet
(
null
,
atomicLong
))
{
}
else
if
(
reference
.
get
()
!=
atomicLong
)
{
throw
new
RuntimeException
(
"Reference should be same!"
);
}
}
catch
(
InterruptedException
|
BrokenBarrierException
e
)
{
e
.
printStackTrace
();
}
finally
{
latch
.
countDown
();
}
}
}).
start
();
}
latch
.
await
();
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录