Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhangjian1949
apollo
提交
d6a65c5e
apollo
项目概览
zhangjian1949
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d6a65c5e
编写于
5月 18, 2016
作者:
L
lepdou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove active env cache
上级
4b6df298
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
34 deletion
+8
-34
apollo-portal/src/main/java/com/ctrip/apollo/portal/PortalSettings.java
...src/main/java/com/ctrip/apollo/portal/PortalSettings.java
+8
-34
未找到文件。
apollo-portal/src/main/java/com/ctrip/apollo/portal/PortalSettings.java
浏览文件 @
d6a65c5e
...
...
@@ -40,18 +40,13 @@ public class PortalSettings {
private
List
<
Env
>
allEnvs
=
new
ArrayList
<
Env
>();
private
volatile
boolean
updatedFromLastHealthCheck
=
true
;
//for cache
private
List
<
Env
>
activeEnvs
=
new
LinkedList
<>();
private
List
<
Env
>
activeEnvs
;
//mark env up or down
private
Map
<
Env
,
Boolean
>
envStatusMark
=
new
ConcurrentHashMap
<>();
private
ScheduledExecutorService
healthCheckService
;
private
Lock
lock
=
new
ReentrantLock
();
@PostConstruct
private
void
postConstruct
()
{
//init origin config envs
...
...
@@ -63,9 +58,6 @@ public class PortalSettings {
envStatusMark
.
put
(
env
,
true
);
}
//init active envs
activeEnvs
=
refreshActiveEnvs
();
healthCheckService
=
Executors
.
newScheduledThreadPool
(
1
);
healthCheckService
...
...
@@ -75,24 +67,14 @@ public class PortalSettings {
}
public
List
<
Env
>
getActiveEnvs
()
{
if
(
updatedFromLastHealthCheck
)
{
lock
.
lock
();
//maybe refresh many times but not create a bad impression.
activeEnvs
=
refreshActiveEnvs
();
lock
.
unlock
();
}
return
activeEnvs
;
}
private
List
<
Env
>
refreshActiveEnvs
()
{
List
<
Env
>
envs
=
new
LinkedList
<>();
List
<
Env
>
activeEnvs
=
new
LinkedList
<>();
for
(
Env
env
:
allEnvs
)
{
if
(
envStatusMark
.
get
(
env
))
{
e
nvs
.
add
(
env
);
activeE
nvs
.
add
(
env
);
}
}
logger
.
info
(
"refresh active envs"
)
;
return
e
nvs
;
this
.
activeEnvs
=
activeEnvs
;
return
activeE
nvs
;
}
public
Env
getFirstAliveEnv
()
{
...
...
@@ -117,7 +99,6 @@ public class PortalSettings {
public
void
run
()
{
logger
.
info
(
"admin server health check start..."
);
boolean
hasUpdateStatus
=
false
;
for
(
Env
env
:
allEnvs
)
{
try
{
...
...
@@ -126,25 +107,20 @@ public class PortalSettings {
if
(!
envStatusMark
.
get
(
env
))
{
envStatusMark
.
put
(
env
,
true
);
healthCheckFailCnt
.
put
(
env
,
0
l
);
hasUpdateStatus
=
true
;
logger
.
info
(
"env up again [env:{}]"
,
env
);
}
}
else
{
//maybe meta server up but admin server down
ha
sUpdateStatus
=
ha
ndleEnvDown
(
env
);
handleEnvDown
(
env
);
}
}
catch
(
Exception
e
)
{
//maybe meta server down
logger
.
warn
(
"health check fail. [env:{}]"
,
env
,
e
.
getMessage
());
ha
sUpdateStatus
=
ha
ndleEnvDown
(
env
);
handleEnvDown
(
env
);
}
}
if
(!
hasUpdateStatus
)
{
logger
.
info
(
"admin server health check OK"
);
}
updatedFromLastHealthCheck
=
hasUpdateStatus
;
}
private
boolean
isUp
(
Env
env
)
{
...
...
@@ -152,17 +128,15 @@ public class PortalSettings {
return
"UP"
.
equals
(
health
.
getStatus
().
getCode
());
}
private
boolean
handleEnvDown
(
Env
env
)
{
private
void
handleEnvDown
(
Env
env
)
{
long
failCnt
=
healthCheckFailCnt
.
get
(
env
);
healthCheckFailCnt
.
put
(
env
,
++
failCnt
);
if
(
envStatusMark
.
get
(
env
)
&&
failCnt
>=
ENV_DIED_THREADHOLD
){
envStatusMark
.
put
(
env
,
false
);
logger
.
error
(
"env turn to down [env:{}]"
,
env
);
return
true
;
}
else
{
logger
.
warn
(
"[env:{}] down yet."
,
env
);
return
false
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录