Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梦中观雨
cat
提交
cac2b6b7
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,发现更多精彩内容 >>
提交
cac2b6b7
编写于
5月 27, 2015
作者:
Y
youyong205
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug
上级
b98c720c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
12 deletion
+18
-12
cat-consumer/src/main/java/com/dianping/cat/consumer/dump/LogviewUploader.java
.../java/com/dianping/cat/consumer/dump/LogviewUploader.java
+13
-7
cat-hadoop/src/main/java/com/dianping/cat/hadoop/hdfs/HdfsUploader.java
.../main/java/com/dianping/cat/hadoop/hdfs/HdfsUploader.java
+5
-5
未找到文件。
cat-consumer/src/main/java/com/dianping/cat/consumer/dump/LogviewUploader.java
浏览文件 @
cac2b6b7
...
...
@@ -3,6 +3,7 @@ package com.dianping.cat.consumer.dump;
import
java.io.File
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.HashSet
;
import
java.util.List
;
...
...
@@ -17,7 +18,6 @@ import com.dianping.cat.Cat;
import
com.dianping.cat.config.server.ServerConfigManager
;
import
com.dianping.cat.configuration.NetworkInterfaceManager
;
import
com.dianping.cat.hadoop.hdfs.HdfsUploader
;
import
com.dianping.cat.helper.TimeHelper
;
import
com.dianping.cat.message.Message
;
import
com.dianping.cat.message.Transaction
;
import
com.dianping.cat.message.storage.LocalMessageBucket
;
...
...
@@ -169,11 +169,15 @@ public class LogviewUploader implements Task {
@Override
public
void
run
()
{
boolean
active
=
true
;
long
start
=
System
.
currentTimeMillis
();
long
current
=
start
/
1000
/
60
;
int
min
=
(
int
)
(
current
%
(
60
));
while
(
active
)
{
long
start
=
System
.
currentTimeMillis
();
long
current
=
start
/
1000
/
60
;
int
min
=
(
int
)
(
current
%
(
60
));
Calendar
nextStart
=
Calendar
.
getInstance
();
nextStart
.
set
(
Calendar
.
MINUTE
,
10
);
nextStart
.
add
(
Calendar
.
HOUR
,
1
);
try
{
if
(
m_configManager
.
isHdfsOn
())
{
// make system 0-10 min is not busy
...
...
@@ -194,10 +198,12 @@ public class LogviewUploader implements Task {
Cat
.
logError
(
e
);
}
try
{
long
duration
=
System
.
currentTimeMillis
()
-
start
;
long
sleepTime
=
TimeHelper
.
ONE_HOUR
-
(
min
-
10
)
*
TimeHelper
.
ONE_MINUTE
-
duration
;
long
end
=
System
.
currentTimeMillis
()
;
long
sleepTime
=
nextStart
.
getTimeInMillis
()
-
end
;
Thread
.
sleep
(
sleepTime
);
if
(
sleepTime
>
0
)
{
Thread
.
sleep
(
sleepTime
);
}
}
catch
(
InterruptedException
e
)
{
active
=
false
;
}
...
...
cat-hadoop/src/main/java/com/dianping/cat/hadoop/hdfs/HdfsUploader.java
浏览文件 @
cac2b6b7
...
...
@@ -47,8 +47,8 @@ public class HdfsUploader implements LogEnabled, Initializable {
File
parent
=
file
.
getParentFile
();
file
.
delete
();
parent
.
delete
();
// delete it if empty
parent
.
getParentFile
().
delete
();
// delete it if empty
parent
.
delete
();
parent
.
getParentFile
().
delete
();
}
@Override
...
...
@@ -107,19 +107,19 @@ public class HdfsUploader implements LogEnabled, Initializable {
t
.
addData
(
"speed"
,
speed
);
t
.
setStatus
(
Message
.
SUCCESS
);
if
(!
file
.
delete
())
{
m_logger
.
warn
(
"Can't delete file: "
+
file
);
}
deleteFile
(
path
);
return
true
;
}
catch
(
AlreadyBeingCreatedException
e
)
{
Cat
.
logError
(
e
);
t
.
setStatus
(
e
);
deleteFile
(
path
);
m_logger
.
error
(
String
.
format
(
"Already being created (%s)!"
,
path
),
e
);
}
catch
(
AccessControlException
e
)
{
Cat
.
logError
(
e
);
t
.
setStatus
(
e
);
deleteFile
(
path
);
m_logger
.
error
(
String
.
format
(
"No permission to create HDFS file(%s)!"
,
path
),
e
);
}
catch
(
Exception
e
)
{
Cat
.
logError
(
e
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录