Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
555e2d59
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,发现更多精彩内容 >>
提交
555e2d59
编写于
1月 16, 2015
作者:
O
Oliver Gondža
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-26411] Handle ChannelClosedException as well
上级
b0351d21
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
8 deletion
+20
-8
core/src/main/java/hudson/model/AbstractBuild.java
core/src/main/java/hudson/model/AbstractBuild.java
+15
-7
test/src/test/java/hudson/model/ExecutorTest.java
test/src/test/java/hudson/model/ExecutorTest.java
+5
-1
未找到文件。
core/src/main/java/hudson/model/AbstractBuild.java
浏览文件 @
555e2d59
...
...
@@ -38,6 +38,7 @@ import hudson.model.Fingerprint.RangeSet;
import
hudson.model.labels.LabelAtom
;
import
hudson.model.listeners.RunListener
;
import
hudson.model.listeners.SCMListener
;
import
hudson.remoting.ChannelClosedException
;
import
hudson.remoting.RequestAbortedException
;
import
hudson.scm.ChangeLogParser
;
import
hudson.scm.ChangeLogSet
;
...
...
@@ -760,13 +761,10 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
canContinue
=
mon
.
perform
(
bs
,
AbstractBuild
.
this
,
launcher
,
listener
);
}
catch
(
RequestAbortedException
ex
)
{
// Channel is closed, do not continue
final
Node
node
=
getCurrentNode
();
listener
.
hyperlink
(
"/"
+
node
.
toComputer
().
getUrl
()
+
"log"
,
"Slave went offline during the build"
);
listener
.
getLogger
().
println
();
final
OfflineCause
offlineCause
=
node
.
toComputer
().
getOfflineCause
();
if
(
offlineCause
!=
null
)
{
listener
.
error
(
offlineCause
.
toString
());
}
reportBrokenChannel
(
listener
);
}
catch
(
ChannelClosedException
ex
)
{
// Channel is closed, do not continue
reportBrokenChannel
(
listener
);
}
catch
(
RuntimeException
ex
)
{
ex
.
printStackTrace
(
listener
.
error
(
"Build step failed with exception"
));
...
...
@@ -787,6 +785,16 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
return
canContinue
;
}
private
void
reportBrokenChannel
(
BuildListener
listener
)
throws
IOException
{
final
Node
node
=
getCurrentNode
();
listener
.
hyperlink
(
"/"
+
node
.
toComputer
().
getUrl
()
+
"log"
,
"Slave went offline during the build"
);
listener
.
getLogger
().
println
();
final
OfflineCause
offlineCause
=
node
.
toComputer
().
getOfflineCause
();
if
(
offlineCause
!=
null
)
{
listener
.
error
(
offlineCause
.
toString
());
}
}
private
String
getBuildStepName
(
BuildStep
bs
)
{
if
(
bs
instanceof
Describable
<?>)
{
return
((
Describable
<?>)
bs
).
getDescriptor
().
getDisplayName
();
...
...
test/src/test/java/hudson/model/ExecutorTest.java
浏览文件 @
555e2d59
...
...
@@ -6,6 +6,7 @@ import static org.junit.Assert.*;
import
com.gargoylesoftware.htmlunit.html.HtmlPage
;
import
hudson.Launcher
;
import
hudson.remoting.VirtualChannel
;
import
hudson.slaves.DumbSlave
;
import
hudson.slaves.OfflineCause
;
import
hudson.util.OneShotEvent
;
...
...
@@ -166,10 +167,13 @@ public class ExecutorTest {
@Override
public
boolean
perform
(
AbstractBuild
<?,
?>
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
VirtualChannel
channel
=
launcher
.
getChannel
();
Node
node
=
build
.
getBuiltOn
();
e
.
signal
();
// we are safe to be interrupted
for
(;;)
{
// Keep using the channel
build
.
getBuiltOn
().
getClockDifference
(
);
channel
.
call
(
node
.
getClockDifferenceCallable
()
);
Thread
.
sleep
(
100
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录