Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
c74999f0
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
c74999f0
编写于
4月 04, 2017
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Found a race condition which could explain random CI hangs of CLIActionTest.authenticate.
上级
56cee951
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
9 deletion
+23
-9
cli/src/main/java/hudson/cli/CLI.java
cli/src/main/java/hudson/cli/CLI.java
+11
-4
core/src/main/java/hudson/cli/CLIAction.java
core/src/main/java/hudson/cli/CLIAction.java
+12
-5
未找到文件。
cli/src/main/java/hudson/cli/CLI.java
浏览文件 @
c74999f0
...
...
@@ -712,6 +712,7 @@ public class CLI implements AutoCloseable {
URL
jenkins
=
new
URL
(
url
+
"cli?remoting=false"
);
FullDuplexHttpStream
streams
=
new
FullDuplexHttpStream
(
jenkins
,
factory
.
authorization
);
class
ClientSideImpl
extends
PlainCLIProtocol
.
ClientSide
{
boolean
complete
;
int
exit
=
-
1
;
ClientSideImpl
(
InputStream
is
,
OutputStream
os
)
throws
IOException
{
super
(
is
,
os
);
...
...
@@ -720,9 +721,9 @@ public class CLI implements AutoCloseable {
}
}
@Override
protected
synchronized
void
onExit
(
int
code
)
{
protected
void
onExit
(
int
code
)
{
this
.
exit
=
code
;
notifyAll
();
finished
();
}
@Override
protected
void
onStdout
(
byte
[]
chunk
)
throws
IOException
{
...
...
@@ -733,7 +734,11 @@ public class CLI implements AutoCloseable {
System
.
err
.
write
(
chunk
);
}
@Override
protected
synchronized
void
handleClose
()
{
protected
void
handleClose
()
{
finished
();
}
private
synchronized
void
finished
()
{
complete
=
true
;
notifyAll
();
}
}
...
...
@@ -761,7 +766,9 @@ public class CLI implements AutoCloseable {
}
}.
start
();
synchronized
(
connection
)
{
connection
.
wait
();
while
(!
connection
.
complete
)
{
connection
.
wait
();
}
}
return
connection
.
exit
;
}
...
...
core/src/main/java/hudson/cli/CLIAction.java
浏览文件 @
c74999f0
...
...
@@ -135,6 +135,7 @@ public class CLIAction implements UnprotectedRootAction, StaplerProxy {
protected
void
run
(
InputStream
upload
,
OutputStream
download
)
throws
IOException
,
InterruptedException
{
final
AtomicReference
<
Thread
>
runningThread
=
new
AtomicReference
<>();
class
ServerSideImpl
extends
PlainCLIProtocol
.
ServerSide
{
boolean
ready
;
List
<
String
>
args
=
new
ArrayList
<>();
Locale
locale
=
Locale
.
getDefault
();
Charset
encoding
=
Charset
.
defaultCharset
();
...
...
@@ -167,8 +168,8 @@ public class CLIAction implements UnprotectedRootAction, StaplerProxy {
}
}
@Override
protected
synchronized
void
onStart
()
{
notifyAll
();
protected
void
onStart
()
{
ready
();
}
@Override
protected
void
onStdin
(
byte
[]
chunk
)
throws
IOException
{
...
...
@@ -179,18 +180,24 @@ public class CLIAction implements UnprotectedRootAction, StaplerProxy {
stdinMatch
.
close
();
}
@Override
protected
synchronized
void
handleClose
()
{
notifyAll
();
protected
void
handleClose
()
{
ready
();
Thread
t
=
runningThread
.
get
();
if
(
t
!=
null
)
{
t
.
interrupt
();
}
}
private
synchronized
void
ready
()
{
ready
=
true
;
notifyAll
();
}
}
try
(
ServerSideImpl
connection
=
new
ServerSideImpl
(
upload
,
download
))
{
connection
.
begin
();
synchronized
(
connection
)
{
connection
.
wait
();
while
(!
connection
.
ready
)
{
connection
.
wait
();
}
}
PrintStream
stdout
=
new
PrintStream
(
connection
.
streamStdout
(),
false
,
connection
.
encoding
.
name
());
PrintStream
stderr
=
new
PrintStream
(
connection
.
streamStderr
(),
true
,
connection
.
encoding
.
name
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录