Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
2c1fb791
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2c1fb791
编写于
12月 11, 2015
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修整UserInfoCoordinator代码,确保逻辑的有效性和健壮性。
上级
e95b993b
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
219 addition
and
255 deletion
+219
-255
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/AlarmMessageProcessThread.java
.../ai/cloud/skywalking/alarm/AlarmMessageProcessThread.java
+0
-1
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/UserInfoCoordinator.java
...va/com/ai/cloud/skywalking/alarm/UserInfoCoordinator.java
+218
-215
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/UserInfoInspector.java
...java/com/ai/cloud/skywalking/alarm/UserInfoInspector.java
+0
-37
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/conf/Config.java
.../main/java/com/ai/cloud/skywalking/alarm/conf/Config.java
+1
-2
未找到文件。
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/AlarmMessageProcessThread.java
浏览文件 @
2c1fb791
...
...
@@ -50,7 +50,6 @@ public class AlarmMessageProcessThread extends Thread {
for
(
Map
.
Entry
<
UserInfo
,
List
<
AlarmRule
>>
entry
:
cacheRules
.
entrySet
())
{
for
(
AlarmRule
rule
:
entry
.
getValue
())
{
processor
.
process
(
entry
.
getKey
(),
rule
);
// System.out.println(currentThread().getName() + " @~ " + entry.getKey().getUserId() + " @~ " + rule.getRuleId());
}
}
}
...
...
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/UserInfoCoordinator.java
浏览文件 @
2c1fb791
...
...
@@ -22,35 +22,22 @@ import java.util.concurrent.TimeUnit;
public
class
UserInfoCoordinator
extends
Thread
{
private
Logger
logger
=
LogManager
.
getLogger
(
UserInfoInspector
.
class
);
private
Logger
logger
=
LogManager
.
getLogger
(
UserInfoCoordinator
.
class
);
private
boolean
redistributing
;
private
boolean
newServerComingFlag
=
false
;
private
RegisterServerWatcher
watcher
=
new
RegisterServerWatcher
();
private
InterProcessMutex
lock
=
new
InterProcessMutex
(
ZKUtil
.
getZkClient
(),
Config
.
ZKPath
.
COORDINATOR_PATH
);
private
boolean
coordinatorFlag
;
private
InterProcessMutex
lock
=
new
InterProcessMutex
(
ZKUtil
.
getZkClient
(),
Config
.
ZKPath
.
COORDINATOR_PATH
);
private
boolean
isCoordinator
=
false
;
public
UserInfoCoordinator
()
{
redistributing
=
false
;
try
{
coordinatorFlag
=
lock
.
acquire
(
Config
.
Coordinator
.
RETRY_GET_COORDINATOR_LOCK_INTERVAL
,
TimeUnit
.
SECONDS
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"Failed to"
,
e
);
coordinatorFlag
=
false
;
}
if
(
coordinatorFlag
)
{
watcherRegisterServerPath
();
}
}
@Override
public
void
run
()
{
if
(!
coordinatorFlag
)
{
//
while
(
true
)
{
try
{
if
(!
isCoordinator
)
{
while
(!
retryBecomeCoordinator
())
{
try
{
Thread
.
sleep
(
Config
.
Coordinator
.
RETRY_BECOME_COORDINATOR_WAIT_TIME
);
...
...
@@ -58,15 +45,14 @@ public class UserInfoCoordinator extends Thread {
logger
.
error
(
"Sleep Failed."
,
e
);
}
}
// 新官上任三把火,重新分配
isCoordinator
=
true
;
watcherRegisterServerPath
();
redistributing
=
true
;
}
while
(
true
)
{
try
{
//检查是否有新服务注册或者在重分配过程做有新处理线程启动了
if
(!
redistributing
&&
!
newServerComingFlag
)
{
// 检查是否有新服务注册或者在重分配过程做有新处理线程启动了
if
(!
redistributing
)
{
try
{
Thread
.
sleep
(
Config
.
Coordinator
.
CHECK_REDISTRIBUTE_INTERVAL
);
}
catch
(
InterruptedException
e
)
{
...
...
@@ -76,52 +62,76 @@ public class UserInfoCoordinator extends Thread {
continue
;
}
newServerComingFla
g
=
false
;
redistributin
g
=
false
;
//
获取当前所有的注册的处理线程
//
获取当前所有的注册的处理线程
List
<
String
>
registeredThreads
=
acquireAllRegisteredThread
();
//修改状态 (开始重新分配状态)
changeStatus
(
registeredThreads
,
ProcessThreadStatus
.
REDISTRIBUTING
);
//检查所有的服务是否都处于空闲状态
while
(!
checkAllProcessStatus
(
registeredThreads
,
ProcessThreadStatus
.
FREE
))
{
// 修改状态 (开始重新分配状态)
changeStatus
(
registeredThreads
,
ProcessThreadStatus
.
REDISTRIBUTING
);
// 检查所有的服务是否都处于空闲状态
int
retryTimes
=
0
;
while
(!
checkAllProcessStatus
(
registeredThreads
,
ProcessThreadStatus
.
FREE
))
{
try
{
Thread
.
sleep
(
Config
.
Coordinator
.
CHECK_ALL_PROCESS_THREAD_INTERVAL
);
retryTimes
++;
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
"Sleep failed"
,
e
);
}
if
(
retryTimes
>
1000
){
logger
.
warn
(
"checking all processors are free, waiting {}ms"
,
Config
.
Coordinator
.
CHECK_ALL_PROCESS_THREAD_INTERVAL
*
retryTimes
);
retryTimes
=
0
;
}
}
//
查询当前有多少用户
//
查询当前有多少用户
List
<
String
>
users
=
AlarmMessageDao
.
selectAllUserIds
();
//将用户重新分配给服务
List
<
String
>
realRedistributeThread
=
allocationUser
(
registeredThreads
,
users
);
// 将用户重新分配给服务
List
<
String
>
realRedistributeThread
=
allocationUser
(
registeredThreads
,
users
);
//修改状态(分配完成)
changeStatus
(
realRedistributeThread
,
ProcessThreadStatus
.
REDISTRIBUTE_SUCCESS
);
// 修改状态(分配完成)
changeStatus
(
realRedistributeThread
,
ProcessThreadStatus
.
REDISTRIBUTE_SUCCESS
);
//检查所有的服务是否都处于忙碌状态
while
(!
checkAllProcessStatus
(
realRedistributeThread
,
ProcessThreadStatus
.
BUSY
))
{
// 检查所有的服务是否都处于忙碌状态
while
(!
checkAllProcessStatus
(
realRedistributeThread
,
ProcessThreadStatus
.
BUSY
))
{
try
{
Thread
.
sleep
(
Config
.
Coordinator
.
CHECK_ALL_PROCESS_THREAD_INTERVAL
);
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
"Sleep failed"
,
e
);
}
}
redistributing
=
false
;
if
(
retryTimes
>
1000
){
logger
.
warn
(
"checking all processors are busy, waiting {}ms"
,
Config
.
Coordinator
.
CHECK_ALL_PROCESS_THREAD_INTERVAL
*
retryTimes
);
retryTimes
=
0
;
}
}
}
catch
(
Exception
e
)
{
logger
.
error
(
"Failed to redistribute User "
,
e
);
logger
.
error
(
"Failed to coordinate, retry. "
,
e
);
releaseCoordinator
();
isCoordinator
=
false
;
}
}
}
private
void
watcherRegisterServerPath
()
{
private
boolean
retryBecomeCoordinator
()
{
try
{
ZKUtil
.
getChildrenWithWatcher
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
,
watcher
);
return
lock
.
acquire
(
Config
.
Coordinator
.
RETRY_GET_COORDINATOR_LOCK_INTERVAL
,
TimeUnit
.
SECONDS
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"Failed to set watcher for get children"
,
e
);
logger
.
error
(
"Failed to acquire lock ."
,
e
);
return
false
;
}
}
private
void
releaseCoordinator
()
{
if
(
lock
!=
null
&&
lock
.
isAcquiredInThisProcess
())
{
try
{
lock
.
release
();
...
...
@@ -130,18 +140,9 @@ public class UserInfoCoordinator extends Thread {
}
}
}
}
private
boolean
retryBecomeCoordinator
()
{
try
{
return
lock
.
acquire
(
5
,
TimeUnit
.
SECONDS
);
}
catch
(
Exception
e
)
{
logger
.
error
(
"Failed to acquire lock ."
,
e
);
return
false
;
}
}
private
List
<
String
>
allocationUser
(
List
<
String
>
registeredThreads
,
List
<
String
>
userIds
)
{
private
List
<
String
>
allocationUser
(
List
<
String
>
registeredThreads
,
List
<
String
>
userIds
)
{
List
<
String
>
realRedistributeThread
=
new
ArrayList
<
String
>();
Set
<
String
>
sortThreadIds
=
new
HashSet
<
String
>(
registeredThreads
);
int
step
=
(
int
)
Math
.
ceil
(
userIds
.
size
()
*
1.0
/
sortThreadIds
.
size
());
...
...
@@ -153,12 +154,17 @@ public class UserInfoCoordinator extends Thread {
}
for
(
String
thread
:
sortThreadIds
)
{
if
(!
ZKUtil
.
exists
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
thread
))
if
(!
ZKUtil
.
exists
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
thread
))
continue
;
String
value
=
ZKUtil
.
getPathData
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
thread
);
ProcessThreadValue
value1
=
new
Gson
().
fromJson
(
value
,
ProcessThreadValue
.
class
);
String
value
=
ZKUtil
.
getPathData
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
thread
);
ProcessThreadValue
value1
=
new
Gson
().
fromJson
(
value
,
ProcessThreadValue
.
class
);
value1
.
setDealUserIds
(
userIds
.
subList
(
start
,
end
));
ZKUtil
.
setPathData
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
thread
,
new
Gson
().
toJson
(
value1
));
ZKUtil
.
setPathData
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
thread
,
new
Gson
().
toJson
(
value1
));
// 实际重新分配的线程Id
realRedistributeThread
.
add
(
thread
);
...
...
@@ -179,33 +185,36 @@ public class UserInfoCoordinator extends Thread {
return
ZKUtil
.
getChildren
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
);
}
private
boolean
checkAllProcessStatus
(
List
<
String
>
registeredThreadIds
,
ProcessThreadStatus
status
)
{
private
boolean
checkAllProcessStatus
(
List
<
String
>
registeredThreadIds
,
ProcessThreadStatus
status
)
{
String
registerPathPrefix
=
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
;
for
(
String
threadId
:
registeredThreadIds
)
{
if
(!
ZKUtil
.
exists
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
threadId
))
if
(!
ZKUtil
.
exists
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
threadId
))
continue
;
if
(
getProcessThreadStatus
(
registerPathPrefix
,
threadId
)
!=
status
)
{
if
(
getProcessThreadStatus
(
registerPathPrefix
,
threadId
)
!=
status
)
{
return
false
;
}
}
return
true
;
}
private
ProcessThreadStatus
getProcessThreadStatus
(
String
registerPathPrefix
,
String
threadId
)
{
private
ProcessThreadStatus
getProcessThreadStatus
(
String
registerPathPrefix
,
String
threadId
)
{
if
(!
ZKUtil
.
exists
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
+
"/"
+
threadId
))
return
ProcessThreadStatus
.
FREE
;
String
value
=
ZKUtil
.
getPathData
(
registerPathPrefix
+
threadId
);
if
(
value
==
null
||
value
.
length
()
==
0
)
return
ProcessThreadStatus
.
FREE
;
ProcessThreadValue
value1
=
new
Gson
().
fromJson
(
value
,
ProcessThreadValue
.
class
);
ProcessThreadValue
value1
=
new
Gson
().
fromJson
(
value
,
ProcessThreadValue
.
class
);
return
ProcessThreadStatus
.
convert
(
value1
.
getStatus
());
}
private
void
changeStatus
(
List
<
String
>
registeredThreadIds
,
ProcessThreadStatus
status
)
{
private
void
changeStatus
(
List
<
String
>
registeredThreadIds
,
ProcessThreadStatus
status
)
{
for
(
String
threadId
:
registeredThreadIds
)
{
ProcessUtil
.
changeProcessThreadStatus
(
threadId
,
status
);
}
...
...
@@ -216,25 +225,19 @@ public class UserInfoCoordinator extends Thread {
@Override
public
void
process
(
WatchedEvent
watchedEvent
)
{
if
(
watchedEvent
.
getType
()
==
Watcher
.
Event
.
EventType
.
NodeChildrenChanged
)
{
if
(
redistributing
)
{
redistributing
=
false
;
newServerComingFlag
=
true
;
}
else
{
redistributing
=
true
;
}
watcherRegisterServerPath
();
}
}
private
void
watcherRegisterServerPath
()
{
try
{
ZKUtil
.
getChildrenWithWatcher
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
,
watcher
);
ZKUtil
.
getChildrenWithWatcher
(
Config
.
ZKPath
.
REGISTER_SERVER_PATH
,
watcher
);
}
catch
(
Exception
e
)
{
if
(
lock
!=
null
&&
lock
.
isAcquiredInThisProcess
())
{
try
{
lock
.
release
();
}
catch
(
Exception
e1
)
{
logger
.
error
(
"Failed to release master locker."
,
e1
);
}
}
}
logger
.
error
(
"Failed to set watcher for get children"
,
e
);
}
}
}
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/UserInfoInspector.java
已删除
100644 → 0
浏览文件 @
e95b993b
package
com.ai.cloud.skywalking.alarm
;
import
com.ai.cloud.skywalking.alarm.dao.AlarmMessageDao
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
public
class
UserInfoInspector
extends
Thread
{
private
Logger
logger
=
LogManager
.
getLogger
(
UserInfoInspector
.
class
);
private
int
preUserSize
;
public
UserInfoInspector
()
{
preUserSize
=
AlarmMessageDao
.
selectUserCount
();
}
@Override
public
void
run
()
{
int
currentUserSize
;
while
(
true
)
{
try
{
Thread
.
sleep
(
10
*
1000L
);
}
catch
(
InterruptedException
e
)
{
logger
.
error
(
"Sleep Failed"
,
e
);
}
currentUserSize
=
AlarmMessageDao
.
selectUserCount
();
if
(
currentUserSize
!=
preUserSize
)
{
logger
.
info
(
"Total user has been changed. Notice all process thread to change process date."
);
for
(
AlarmMessageProcessThread
thread
:
AlarmProcessServer
.
getProcessThreads
())
{
//thread.setChanged(true);
}
}
}
}
}
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/conf/Config.java
浏览文件 @
2c1fb791
...
...
@@ -12,7 +12,6 @@ public class Config {
public
static
class
ProcessThread
{
public
static
long
THREAD_WAIT_INTERVAL
=
60
*
1000L
;
//public static long THREAD_WAIT_INTERVAL = 1 * 1000L;
}
public
static
class
ZKPath
{
...
...
@@ -42,7 +41,7 @@ public class Config {
// 单位:(毫秒)
public
static
long
CHECK_REDISTRIBUTE_INTERVAL
=
5
*
1000
;
// 单位:(毫秒)
public
static
long
CHECK_ALL_PROCESS_THREAD_INTERVAL
=
1
00L
;
public
static
long
CHECK_ALL_PROCESS_THREAD_INTERVAL
=
5
00L
;
}
public
static
class
DB
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录