Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
cb7a0911
C
cat
项目概览
梦中观雨
/
cat
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cb7a0911
编写于
8月 14, 2013
作者:
Y
yong.you
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove unused interface in message bucket
上级
de3d7adf
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
21 deletion
+19
-21
cat-core/src/main/java/com/dianping/cat/storage/dump/LocalMessageBucketManager.java
.../dianping/cat/storage/dump/LocalMessageBucketManager.java
+1
-2
cat-core/src/main/java/com/dianping/cat/storage/dump/MessageBucketManager.java
...a/com/dianping/cat/storage/dump/MessageBucketManager.java
+0
-2
cat-core/src/test/java/com/dianping/cat/storage/dump/LocalMessageBucketManagerTest.java
...nping/cat/storage/dump/LocalMessageBucketManagerTest.java
+0
-2
cat-hadoop/src/main/java/com/dianping/cat/hadoop/hdfs/HdfsMessageBucketManager.java
...om/dianping/cat/hadoop/hdfs/HdfsMessageBucketManager.java
+18
-13
cat-hadoop/src/test/java/com/dianping/cat/hadoop/hdfs/HdfsMessageBucketManagerTest.java
...ianping/cat/hadoop/hdfs/HdfsMessageBucketManagerTest.java
+0
-2
未找到文件。
cat-core/src/main/java/com/dianping/cat/storage/dump/LocalMessageBucketManager.java
浏览文件 @
cb7a0911
...
...
@@ -109,7 +109,6 @@ public class LocalMessageBucketManager extends ContainerHolder implements Messag
}
}
@Override
public
void
close
()
throws
IOException
{
synchronized
(
m_buckets
)
{
for
(
LocalMessageBucket
bucket
:
m_buckets
.
values
())
{
...
...
@@ -580,7 +579,7 @@ public class LocalMessageBucketManager extends ContainerHolder implements Messag
long
current
=
System
.
currentTimeMillis
()
/
1000
/
60
;
int
min
=
(
int
)
(
current
%
(
60
));
// make system
is
0-10 min is not busy
// make system 0-10 min is not busy
if
(
min
>
10
)
{
moveOldMessages
();
}
...
...
cat-core/src/main/java/com/dianping/cat/storage/dump/MessageBucketManager.java
浏览文件 @
cb7a0911
...
...
@@ -6,8 +6,6 @@ import com.dianping.cat.message.internal.MessageId;
import
com.dianping.cat.message.spi.MessageTree
;
public
interface
MessageBucketManager
{
public
void
close
()
throws
IOException
;
public
MessageTree
loadMessage
(
String
messageId
)
throws
IOException
;
public
void
storeMessage
(
MessageTree
tree
,
MessageId
id
)
throws
IOException
;
...
...
cat-core/src/test/java/com/dianping/cat/storage/dump/LocalMessageBucketManagerTest.java
浏览文件 @
cb7a0911
...
...
@@ -87,8 +87,6 @@ public class LocalMessageBucketManagerTest extends ComponentTestCase {
Assert
.
assertNotNull
(
"Message "
+
i
+
" not found."
,
tree
);
Assert
.
assertEquals
(
messageId
,
tree
.
getMessageId
());
}
manager
.
close
();
}
static
class
MockMessageIdFactory
extends
MessageIdFactory
{
...
...
cat-hadoop/src/main/java/com/dianping/cat/hadoop/hdfs/HdfsMessageBucketManager.java
浏览文件 @
cb7a0911
...
...
@@ -3,15 +3,17 @@ package com.dianping.cat.hadoop.hdfs;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Hash
Map
;
import
java.util.Hash
Set
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
org.apache.hadoop.fs.FileSystem
;
import
org.apache.hadoop.fs.Path
;
import
org.apache.hadoop.fs.PathFilter
;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable
;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException
;
import
org.jboss.netty.util.internal.ConcurrentHashMap
;
import
org.unidal.helper.Threads
;
import
org.unidal.helper.Threads.Task
;
import
org.unidal.lookup.ContainerHolder
;
...
...
@@ -40,24 +42,28 @@ public class HdfsMessageBucketManager extends ContainerHolder implements Message
@Inject
private
ServerConfigManager
m_serverConfigManager
;
private
Map
<
String
,
HdfsMessageBucket
>
m_buckets
=
new
HashMap
<
String
,
HdfsMessageBucket
>();
@Override
public
void
close
()
throws
IOException
{
for
(
HdfsMessageBucket
bucket
:
m_buckets
.
values
())
{
bucket
.
close
();
}
}
private
Map
<
String
,
HdfsMessageBucket
>
m_buckets
=
new
ConcurrentHashMap
<
String
,
HdfsMessageBucket
>();
void
closeIdleBuckets
()
throws
IOException
{
long
now
=
System
.
currentTimeMillis
();
long
hour
=
3600
*
1000L
;
Set
<
String
>
closed
=
new
HashSet
<
String
>();
for
(
HdfsMessageBucket
bucket
:
m_buckets
.
values
())
{
for
(
Map
.
Entry
<
String
,
HdfsMessageBucket
>
entry
:
m_buckets
.
entrySet
())
{
HdfsMessageBucket
bucket
=
entry
.
getValue
();
if
(
now
-
bucket
.
getLastAccessTime
()
>=
hour
)
{
bucket
.
close
();
try
{
bucket
.
close
();
closed
.
add
(
entry
.
getKey
());
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
}
}
}
for
(
String
close:
closed
){
m_buckets
.
remove
(
close
);
}
}
@Override
...
...
@@ -115,7 +121,6 @@ public class HdfsMessageBucketManager extends ContainerHolder implements Message
bucket
.
initialize
(
dataFile
);
m_buckets
.
put
(
dataFile
,
bucket
);
}
if
(
bucket
!=
null
)
{
MessageTree
tree
=
bucket
.
findById
(
messageId
);
...
...
@@ -164,7 +169,7 @@ public class HdfsMessageBucketManager extends ContainerHolder implements Message
try
{
closeIdleBuckets
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
(
);
Cat
.
logError
(
e
);
}
}
}
catch
(
InterruptedException
e
)
{
...
...
cat-hadoop/src/test/java/com/dianping/cat/hadoop/hdfs/HdfsMessageBucketManagerTest.java
浏览文件 @
cb7a0911
...
...
@@ -78,8 +78,6 @@ public class HdfsMessageBucketManagerTest extends ComponentTestCase {
Assert
.
assertNotNull
(
"Message "
+
i
+
" not found."
,
tree
);
Assert
.
assertEquals
(
messageId
,
tree
.
getMessageId
());
}
hdfsManager
.
close
();
}
static
class
MockMessageIdFactory
extends
MessageIdFactory
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录