Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
31938291
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,发现更多精彩内容 >>
提交
31938291
编写于
9月 03, 2015
作者:
V
Valentina Armenise
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-30084] method renamed and added check on field type
上级
fced6f98
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
31 addition
and
22 deletion
+31
-22
core/src/main/java/hudson/model/Queue.java
core/src/main/java/hudson/model/Queue.java
+31
-22
未找到文件。
core/src/main/java/hudson/model/Queue.java
浏览文件 @
31938291
...
...
@@ -1461,7 +1461,7 @@ public class Queue extends ResourceController implements Saveable {
for
(
BuildableItem
p
:
new
ArrayList
<
BuildableItem
>(
buildables
))
{
// copy as we'll mutate the list in the loop
if
(
p
.
task
instanceof
FlyweightTask
)
{
Runnable
r
=
buildOnTemporaryNod
e
(
new
BuildableItem
(
p
));
Runnable
r
=
makeFlyWeightTaskBuildabl
e
(
new
BuildableItem
(
p
));
if
(
r
!=
null
)
{
p
.
leave
(
this
);
r
.
run
();
...
...
@@ -1533,7 +1533,7 @@ public class Queue extends ResourceController implements Saveable {
if
(
p
.
task
instanceof
FlyweightTask
)
{
if
(!
isBlockedByShutdown
(
p
.
task
))
{
Runnable
runnable
=
buildOnTemporaryNod
e
(
p
);
Runnable
runnable
=
makeFlyWeightTaskBuildabl
e
(
p
);
if
(
runnable
!=
null
){
return
runnable
;
...
...
@@ -1560,31 +1560,40 @@ public class Queue extends ResourceController implements Saveable {
}
}
private
Runnable
buildOnTemporaryNode
(
final
BuildableItem
p
){
Jenkins
h
=
Jenkins
.
getInstance
();
Map
<
Node
,
Integer
>
hashSource
=
new
HashMap
<
Node
,
Integer
>(
h
.
getNodes
().
size
());
/**
* This method checks if the flyweight task can be run on any of the available executors
* @param p - the flyweight task to be scheduled
* @return a Runnable if there is an executor that can take the task, null otherwise
*/
private
Runnable
makeFlyWeightTaskBuildable
(
final
BuildableItem
p
){
//we double check if this is a flyweight task
if
(
p
.
task
instanceof
FlyweightTask
)
{
Jenkins
h
=
Jenkins
.
getInstance
();
Map
<
Node
,
Integer
>
hashSource
=
new
HashMap
<
Node
,
Integer
>(
h
.
getNodes
().
size
());
// Even if master is configured with zero executors, we may need to run a flyweight task like MatrixProject on it.
hashSource
.
put
(
h
,
Math
.
max
(
h
.
getNumExecutors
()
*
100
,
1
));
// Even if master is configured with zero executors, we may need to run a flyweight task like MatrixProject on it.
hashSource
.
put
(
h
,
Math
.
max
(
h
.
getNumExecutors
()
*
100
,
1
));
for
(
Node
n
:
h
.
getNodes
())
{
hashSource
.
put
(
n
,
n
.
getNumExecutors
()
*
100
);
}
for
(
Node
n
:
h
.
getNodes
())
{
hashSource
.
put
(
n
,
n
.
getNumExecutors
()
*
100
);
}
ConsistentHash
<
Node
>
hash
=
new
ConsistentHash
<
Node
>(
NODE_HASH
);
hash
.
addAll
(
hashSource
);
ConsistentHash
<
Node
>
hash
=
new
ConsistentHash
<
Node
>(
NODE_HASH
);
hash
.
addAll
(
hashSource
);
for
(
Node
n
:
hash
.
list
(
p
.
task
.
getFullDisplayName
()))
{
final
Computer
c
=
n
.
toComputer
();
if
(
n
.
canTake
(
p
)
!=
null
)
continue
;
if
(
c
==
null
||
c
.
isOffline
())
continue
;
return
new
Runnable
()
{
@Override
public
void
run
()
{
c
.
startFlyWeightTask
(
new
WorkUnitContext
(
p
).
createWorkUnit
(
p
.
task
));
makePending
(
p
);
for
(
Node
n
:
hash
.
list
(
p
.
task
.
getFullDisplayName
()))
{
final
Computer
c
=
n
.
toComputer
();
if
(
n
.
canTake
(
p
)
!=
null
)
continue
;
if
(
c
==
null
||
c
.
isOffline
())
continue
;
return
new
Runnable
()
{
@Override
public
void
run
()
{
c
.
startFlyWeightTask
(
new
WorkUnitContext
(
p
).
createWorkUnit
(
p
.
task
));
makePending
(
p
);
}
};
}
};
}
}
return
null
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录