Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
bff971ea
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,发现更多精彩内容 >>
提交
bff971ea
编写于
3月 14, 2011
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "[FIXED JENKINS-8790] Build Queue Fails for Parameterized Matrix Projects."
This reverts commit
65689f17
.
上级
4e9c9bd8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
30 deletion
+5
-30
core/src/main/java/hudson/model/Queue.java
core/src/main/java/hudson/model/Queue.java
+5
-30
未找到文件。
core/src/main/java/hudson/model/Queue.java
浏览文件 @
bff971ea
...
@@ -910,10 +910,9 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -910,10 +910,9 @@ public class Queue extends ResourceController implements Saveable {
BlockedItem
p
=
itr
.
next
();
BlockedItem
p
=
itr
.
next
();
if
(!
isBuildBlocked
(
p
.
task
)
&&
allowNewBuildableTask
(
p
.
task
))
{
if
(!
isBuildBlocked
(
p
.
task
)
&&
allowNewBuildableTask
(
p
.
task
))
{
// ready to be executed
// ready to be executed
if
(
makeBuildable
(
new
BuildableItem
(
p
)))
{
LOGGER
.
fine
(
p
.
task
.
getFullDisplayName
()
+
" no longer blocked"
);
LOGGER
.
fine
(
p
.
task
.
getFullDisplayName
()
+
" no longer blocked"
);
itr
.
remove
();
itr
.
remove
();
}
makeBuildable
(
new
BuildableItem
(
p
));
}
}
}
}
...
@@ -925,13 +924,10 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -925,13 +924,10 @@ public class Queue extends ResourceController implements Saveable {
waitingList
.
remove
(
top
);
waitingList
.
remove
(
top
);
Task
p
=
top
.
task
;
Task
p
=
top
.
task
;
boolean
isReady
=
false
;
if
(!
isBuildBlocked
(
p
)
&&
allowNewBuildableTask
(
p
))
{
if
(!
isBuildBlocked
(
p
)
&&
allowNewBuildableTask
(
p
))
{
// maybe ready to be executed immediately
// ready to be executed immediately
isReady
=
makeBuildable
(
new
BuildableItem
(
top
));
}
if
(
isReady
)
{
LOGGER
.
fine
(
p
.
getFullDisplayName
()
+
" ready to build"
);
LOGGER
.
fine
(
p
.
getFullDisplayName
()
+
" ready to build"
);
makeBuildable
(
new
BuildableItem
(
top
));
}
else
{
}
else
{
// this can't be built now because another build is in progress
// this can't be built now because another build is in progress
// set this project aside.
// set this project aside.
...
@@ -945,7 +941,7 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -945,7 +941,7 @@ public class Queue extends ResourceController implements Saveable {
s
.
sortBuildableItems
(
buildables
);
s
.
sortBuildableItems
(
buildables
);
}
}
private
boolean
makeBuildable
(
BuildableItem
p
)
{
private
void
makeBuildable
(
BuildableItem
p
)
{
if
(
Hudson
.
FLYWEIGHT_SUPPORT
&&
p
.
task
instanceof
FlyweightTask
&&
!
ifBlockedByHudsonShutdown
(
p
.
task
))
{
if
(
Hudson
.
FLYWEIGHT_SUPPORT
&&
p
.
task
instanceof
FlyweightTask
&&
!
ifBlockedByHudsonShutdown
(
p
.
task
))
{
ConsistentHash
<
Node
>
hash
=
new
ConsistentHash
<
Node
>(
new
Hash
<
Node
>()
{
ConsistentHash
<
Node
>
hash
=
new
ConsistentHash
<
Node
>(
new
Hash
<
Node
>()
{
public
String
hash
(
Node
node
)
{
public
String
hash
(
Node
node
)
{
...
@@ -962,35 +958,14 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -962,35 +958,14 @@ public class Queue extends ResourceController implements Saveable {
Computer
c
=
n
.
toComputer
();
Computer
c
=
n
.
toComputer
();
if
(
c
==
null
||
c
.
isOffline
())
continue
;
if
(
c
==
null
||
c
.
isOffline
())
continue
;
if
(
lbl
!=
null
&&
!
lbl
.
contains
(
n
))
continue
;
if
(
lbl
!=
null
&&
!
lbl
.
contains
(
n
))
continue
;
// Prevent multiple instances of a project's FlyWeightTask
// from all executing on the same computer at the same time.
// Without this logic, queuing-up several builds for a
// parameterized matrix project didn't work: parent builds
// weren't waiting their turn in the queue.
List
<
OneOffExecutor
>
oneOffExecutors
=
c
.
getOneOffExecutors
();
for
(
OneOffExecutor
ooe
:
oneOffExecutors
)
{
Queue
.
Executable
exe
=
ooe
.
getCurrentExecutable
();
if
(
exe
==
null
)
return
false
;
if
(
exe
instanceof
AbstractBuild
)
{
AbstractBuild
b
=
(
AbstractBuild
)
exe
;
String
running
=
b
.
getProject
().
getName
();
String
toRun
=
p
.
task
.
getName
();
if
(
toRun
.
equals
(
running
))
return
false
;
}
}
c
.
startFlyWeightTask
(
new
WorkUnitContext
(
p
).
createWorkUnit
(
p
.
task
));
c
.
startFlyWeightTask
(
new
WorkUnitContext
(
p
).
createWorkUnit
(
p
.
task
));
return
true
;
return
;
}
}
// if the execution get here, it means we couldn't schedule it anywhere.
// if the execution get here, it means we couldn't schedule it anywhere.
// so do the scheduling like other normal jobs.
// so do the scheduling like other normal jobs.
}
}
buildables
.
put
(
p
.
task
,
p
);
buildables
.
put
(
p
.
task
,
p
);
return
true
;
}
}
public
static
boolean
ifBlockedByHudsonShutdown
(
Task
task
)
{
public
static
boolean
ifBlockedByHudsonShutdown
(
Task
task
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录