Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
efb7ebcd
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,发现更多精彩内容 >>
提交
efb7ebcd
编写于
1月 05, 2015
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ifBlockedByHudsonShutdown renamed to isBlockedByShutdown.
上级
c3021e92
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
4 deletion
+15
-4
core/src/main/java/hudson/model/LoadBalancer.java
core/src/main/java/hudson/model/LoadBalancer.java
+1
-1
core/src/main/java/hudson/model/Queue.java
core/src/main/java/hudson/model/Queue.java
+14
-3
未找到文件。
core/src/main/java/hudson/model/LoadBalancer.java
浏览文件 @
efb7ebcd
...
...
@@ -140,7 +140,7 @@ public abstract class LoadBalancer implements ExtensionPoint {
return
new
LoadBalancer
()
{
@Override
public
Mapping
map
(
Task
task
,
MappingWorksheet
worksheet
)
{
if
(
Queue
.
i
fBlockedByHudson
Shutdown
(
task
))
{
if
(
Queue
.
i
sBlockedBy
Shutdown
(
task
))
{
// if we are quieting down, don't start anything new so that
// all executors will be eventually free.
return
null
;
...
...
core/src/main/java/hudson/model/Queue.java
浏览文件 @
efb7ebcd
...
...
@@ -1165,7 +1165,7 @@ public class Queue extends ResourceController implements Saveable {
}
private
void
makeBuildable
(
BuildableItem
p
)
{
if
(
p
.
task
instanceof
FlyweightTask
&&
!
i
fBlockedByHudson
Shutdown
(
p
.
task
))
{
if
(
p
.
task
instanceof
FlyweightTask
&&
!
i
sBlockedBy
Shutdown
(
p
.
task
))
{
Jenkins
h
=
Jenkins
.
getInstance
();
...
...
@@ -1211,7 +1211,18 @@ public class Queue extends ResourceController implements Saveable {
return
pendings
.
add
(
p
);
}
/** @deprecated Use {@link #isBlockedByShutdown} instead. */
public
static
boolean
ifBlockedByHudsonShutdown
(
Task
task
)
{
return
isBlockedByShutdown
(
task
);
}
/**
* Checks whether a task should not be scheduled because {@link Jenkins#isQuietingDown()}.
* @param task some queue task
* @return true if {@link Jenkins#isQuietingDown()} unless this is a {@link NonBlockingTask}
* @since TODO
*/
public
static
boolean
isBlockedByShutdown
(
Task
task
)
{
return
Jenkins
.
getInstance
().
isQuietingDown
()
&&
!(
task
instanceof
NonBlockingTask
);
}
...
...
@@ -1235,7 +1246,7 @@ public class Queue extends ResourceController implements Saveable {
/**
* Marks {@link Task}s that are not affected by the {@linkplain Jenkins#isQuietingDown()} quieting down},
* because these tasks keep other tasks executing.
*
*
@see #isBlockedByShutdown
* @since 1.336
*/
public
interface
NonBlockingTask
extends
Task
{}
...
...
@@ -1926,7 +1937,7 @@ public class Queue extends ResourceController implements Saveable {
public
CauseOfBlockage
getCauseOfBlockage
()
{
Jenkins
jenkins
=
Jenkins
.
getInstance
();
if
(
i
fBlockedByHudson
Shutdown
(
task
))
if
(
i
sBlockedBy
Shutdown
(
task
))
return
CauseOfBlockage
.
fromMessage
(
Messages
.
_Queue_HudsonIsAboutToShutDown
());
Label
label
=
getAssignedLabel
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录