Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
b9dcb405
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,发现更多精彩内容 >>
提交
b9dcb405
编写于
8月 10, 2012
作者:
F
Frankie Wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
delete empty dir after dump upload
上级
765a357a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
5 deletion
+18
-5
cat-consumer/src/main/java/com/dianping/cat/consumer/dump/DumpUploader.java
...ain/java/com/dianping/cat/consumer/dump/DumpUploader.java
+13
-5
cat-core/src/main/java/com/dianping/cat/storage/dump/LocalMessageBucket.java
...ava/com/dianping/cat/storage/dump/LocalMessageBucket.java
+5
-0
未找到文件。
cat-consumer/src/main/java/com/dianping/cat/consumer/dump/DumpUploader.java
浏览文件 @
b9dcb405
...
...
@@ -113,7 +113,7 @@ public class DumpUploader implements Initializable, LogEnabled {
try
{
Thread
.
sleep
(
sleepPeriod
);
}
catch
(
InterruptedException
e
)
{
//ignore it
//
ignore it
}
}
}
...
...
@@ -140,7 +140,9 @@ public class DumpUploader implements Initializable, LogEnabled {
}
});
if
(
paths
.
size
()
>
0
)
{
int
len
=
paths
.
size
();
if
(
len
>
0
)
{
Cat
.
setup
(
"DumpUploader"
);
MessageProducer
cat
=
Cat
.
getProducer
();
...
...
@@ -153,7 +155,8 @@ public class DumpUploader implements Initializable, LogEnabled {
root
.
addData
(
"files"
,
paths
);
root
.
setStatus
(
Message
.
SUCCESS
);
for
(
String
path
:
paths
)
{
for
(
int
i
=
0
;
i
<
len
;
i
++)
{
String
path
=
paths
.
get
(
i
);
Transaction
t
=
cat
.
newTransaction
(
"System"
,
"UploadDump"
);
File
file
=
new
File
(
baseDir
,
path
);
...
...
@@ -176,12 +179,17 @@ public class DumpUploader implements Initializable, LogEnabled {
t
.
addData
(
"speed"
,
speed
);
t
.
setStatus
(
Message
.
SUCCESS
);
m_logger
.
info
(
String
.
format
(
"Finish uploading(%s) to HDFS(%s) with size(%s) at %s."
,
file
.
getCanonicalPath
(),
path
,
size
,
speed
));
m_logger
.
info
(
String
.
format
(
"Finish uploading(%s) to HDFS(%s) with size(%s) at %s."
,
file
.
getCanonicalPath
(),
path
,
size
,
speed
));
if
(!
file
.
delete
())
{
m_logger
.
warn
(
"Can't delete file: "
+
file
);
}
if
(
i
==
len
-
1
)
{
file
.
getParentFile
().
delete
();
// try to delete parent dir
file
.
getParentFile
().
getParentFile
().
delete
();
// try to delete parent dir
}
}
catch
(
AccessControlException
e
)
{
cat
.
logError
(
e
);
t
.
setStatus
(
e
);
...
...
cat-core/src/main/java/com/dianping/cat/storage/dump/LocalMessageBucket.java
浏览文件 @
b9dcb405
...
...
@@ -269,5 +269,10 @@ public class LocalMessageBucket implements MessageBucket {
Files
.
forDir
().
copyFile
(
fromIndex
,
toIndex
);
Files
.
forDir
().
delete
(
from
);
Files
.
forDir
().
delete
(
fromIndex
);
File
parentFile
=
from
.
getParentFile
();
parentFile
.
delete
();
// delete it if empty
parentFile
.
getParentFile
().
delete
();
// delete it if empty
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录