Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
52c21f2d
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
52c21f2d
编写于
1月 24, 2011
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
If a master fails to ping a slave, it should be hard-disconnected.
上级
3356f4da
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
2 deletion
+17
-2
changelog.html
changelog.html
+2
-0
core/src/main/java/hudson/TcpSlaveAgentListener.java
core/src/main/java/hudson/TcpSlaveAgentListener.java
+6
-0
core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
...c/main/java/hudson/node_monitors/ResponseTimeMonitor.java
+8
-1
core/src/main/resources/hudson/node_monitors/Messages.properties
...c/main/resources/hudson/node_monitors/Messages.properties
+1
-1
未找到文件。
changelog.html
浏览文件 @
52c21f2d
...
...
@@ -43,6 +43,8 @@ Upcoming changes</a>
<li
class=
bug
>
Fixed a bug in crontab "day of week" handling in locales where a week starts from Monday.
(
<a
href=
"http://issues.hudson-ci.org/browse/HUDSON-8401"
>
issue 8401
</a>
)
<li
class=
bug
>
If a master fails to ping a slave, it should be hard-disconnected.
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/src/main/java/hudson/TcpSlaveAgentListener.java
浏览文件 @
52c21f2d
...
...
@@ -116,6 +116,12 @@ public final class TcpSlaveAgentListener extends Thread {
// the loop eventually terminates when the socket is closed.
while
(
true
)
{
Socket
s
=
serverSocket
.
accept
();
// this prevents a connection from silently terminated by the router in between or the other peer
// and that goes without unnoticed. However, the time out is often very long (for example 2 hours
// by default in Linux) that this alone is enough to prevent that.
s
.
setKeepAlive
(
true
);
new
ConnectionHandler
(
s
).
start
();
}
}
catch
(
IOException
e
)
{
...
...
core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
浏览文件 @
52c21f2d
...
...
@@ -25,6 +25,7 @@ package hudson.node_monitors;
import
hudson.Util
;
import
hudson.Extension
;
import
hudson.model.Descriptor.FormException
;
import
hudson.slaves.OfflineCause
;
import
hudson.model.Computer
;
import
hudson.remoting.Callable
;
...
...
@@ -67,8 +68,14 @@ public class ResponseTimeMonitor extends NodeMonitor {
d
=
new
Data
(
old
,-
1L
);
}
if
(
d
.
hasTooManyTimeouts
()
&&
markOffline
(
c
,
d
))
if
(
d
.
hasTooManyTimeouts
()
&&
!
isIgnored
())
{
// unlike other monitors whose failure still allow us to communicate with the slave,
// the failure in this monitor indicates that we are just unable to make any requests
// to this slave. So we should severe the connection, as opposed to marking it temporarily
// off line, which still keeps the underlying channel open.
c
.
disconnect
(
d
);
LOGGER
.
warning
(
Messages
.
ResponseTimeMonitor_MarkedOffline
(
c
.
getName
()));
}
return
d
;
}
...
...
core/src/main/resources/hudson/node_monitors/Messages.properties
浏览文件 @
52c21f2d
...
...
@@ -25,7 +25,7 @@ ClockMonitor.DisplayName=Clock Difference
DiskSpaceMonitor.MarkedOffline
=
Making {0} offline temporarily due to the lack of disk space
DiskSpaceMonitor.DisplayName
=
Free Disk Space
ResponseTimeMonitor.DisplayName
=
Response Time
ResponseTimeMonitor.MarkedOffline
=
Making {0} offline
temporarily
because it''s not responding
ResponseTimeMonitor.MarkedOffline
=
Making {0} offline because it''s not responding
ResponseTimeMonitor.TimeOut
=
Time out for last {0} try
SwapSpaceMonitor.DisplayName
=
Free Swap Space
TemporarySpaceMonitor.DisplayName
=
Free Temp Space
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录