Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
0d553783
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
0d553783
编写于
5月 11, 2015
作者:
O
Oliver Gondža
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1688 from olivergondza/report-launcher-exited
Report launcher exited before establishing the channel
上级
32da5d79
1070194c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
101 addition
and
9 deletion
+101
-9
core/src/main/java/hudson/slaves/CommandLauncher.java
core/src/main/java/hudson/slaves/CommandLauncher.java
+13
-9
test/src/test/java/hudson/slaves/CommandLauncherTest.java
test/src/test/java/hudson/slaves/CommandLauncherTest.java
+88
-0
未找到文件。
core/src/main/java/hudson/slaves/CommandLauncher.java
浏览文件 @
0d553783
...
...
@@ -130,14 +130,7 @@ public class CommandLauncher extends ComputerLauncher {
computer
.
setChannel
(
proc
.
getInputStream
(),
proc
.
getOutputStream
(),
listener
.
getLogger
(),
new
Channel
.
Listener
()
{
@Override
public
void
onClosed
(
Channel
channel
,
IOException
cause
)
{
try
{
int
exitCode
=
proc
.
exitValue
();
if
(
exitCode
!=
0
)
{
listener
.
error
(
"Process terminated with exit code "
+
exitCode
);
}
}
catch
(
IllegalThreadStateException
e
)
{
// hasn't terminated yet
}
reportProcessTerminated
(
proc
,
listener
);
try
{
ProcessTree
.
get
().
killAll
(
proc
,
cookie
);
...
...
@@ -167,12 +160,23 @@ public class CommandLauncher extends ComputerLauncher {
LOGGER
.
log
(
Level
.
SEVERE
,
msg
,
e
);
e
.
printStackTrace
(
listener
.
error
(
msg
));
if
(
_proc
!=
null
)
if
(
_proc
!=
null
)
{
reportProcessTerminated
(
_proc
,
listener
);
try
{
ProcessTree
.
get
().
killAll
(
_proc
,
_cookie
);
}
catch
(
InterruptedException
x
)
{
x
.
printStackTrace
(
listener
.
error
(
Messages
.
ComputerLauncher_abortedLaunch
()));
}
}
}
}
private
static
void
reportProcessTerminated
(
Process
proc
,
TaskListener
listener
)
{
try
{
int
exitCode
=
proc
.
exitValue
();
listener
.
error
(
"Process terminated with exit code "
+
exitCode
);
}
catch
(
IllegalThreadStateException
e
)
{
// hasn't terminated yet
}
}
...
...
test/src/test/java/hudson/slaves/CommandLauncherTest.java
0 → 100644
浏览文件 @
0d553783
/*
* The MIT License
*
* Copyright (c) 2015 Red Hat, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
hudson.slaves
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
hamcrest
.
Matchers
.
not
;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
static
org
.
junit
.
Assume
.
assumeTrue
;
import
hudson.Functions
;
import
hudson.model.Node
;
import
java.util.Collections
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.JenkinsRule
;
public
class
CommandLauncherTest
{
@Rule
public
JenkinsRule
j
=
new
JenkinsRule
();
@Test
public
void
commandFails
()
throws
Exception
{
assumeTrue
(!
Functions
.
isWindows
());
DumbSlave
slave
=
createSlave
(
"false"
);
String
log
=
slave
.
toComputer
().
getLog
();
assertTrue
(
log
,
slave
.
toComputer
().
isOffline
());
assertThat
(
log
,
containsString
(
"ERROR: Process terminated with exit code"
));
assertThat
(
log
,
not
(
containsString
(
"ERROR: Process terminated with exit code 0"
)));
}
@Test
public
void
commandSuceedsWithoutChannel
()
throws
Exception
{
assumeTrue
(!
Functions
.
isWindows
());
DumbSlave
slave
=
createSlave
(
"true"
);
String
log
=
slave
.
toComputer
().
getLog
();
assertTrue
(
log
,
slave
.
toComputer
().
isOffline
());
assertThat
(
log
,
containsString
(
"ERROR: Process terminated with exit code 0"
));
}
public
DumbSlave
createSlave
(
String
command
)
throws
Exception
{
DumbSlave
slave
;
synchronized
(
j
.
jenkins
)
{
slave
=
new
DumbSlave
(
"dummy"
,
"dummy"
,
j
.
createTmpDir
().
getPath
(),
"1"
,
Node
.
Mode
.
NORMAL
,
""
,
new
CommandLauncher
(
command
),
RetentionStrategy
.
NOOP
,
Collections
.
EMPTY_LIST
);
j
.
jenkins
.
addNode
(
slave
);
}
Thread
.
sleep
(
100
);
return
slave
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录