Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
5afddb1a
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,发现更多精彩内容 >>
提交
5afddb1a
编写于
2月 04, 2016
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:jenkinsci/jenkins
上级
47d74c3f
95043db7
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
14 addition
and
49 deletion
+14
-49
core/src/main/java/hudson/model/Queue.java
core/src/main/java/hudson/model/Queue.java
+3
-43
core/src/main/java/hudson/model/View.java
core/src/main/java/hudson/model/View.java
+5
-0
core/src/main/java/hudson/widgets/BuildHistoryWidget.java
core/src/main/java/hudson/widgets/BuildHistoryWidget.java
+1
-1
core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
...c/main/resources/hudson/model/ComputerSet/sidepanel.jelly
+1
-1
core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
...src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
+1
-1
core/src/main/resources/jenkins/widgets/BuildQueueWidget/index.groovy
...n/resources/jenkins/widgets/BuildQueueWidget/index.groovy
+1
-1
core/src/main/resources/lib/hudson/queue.jelly
core/src/main/resources/lib/hudson/queue.jelly
+1
-1
test/src/test/java/hudson/model/QueueTest.java
test/src/test/java/hudson/model/QueueTest.java
+1
-1
未找到文件。
core/src/main/java/hudson/model/Queue.java
浏览文件 @
5afddb1a
...
...
@@ -171,13 +171,6 @@ import org.kohsuke.stapler.interceptor.RequirePOST;
@ExportedBean
public
class
Queue
extends
ResourceController
implements
Saveable
{
/**
* Defines the refresh period for of the internal cache ({@link #itemsView}).
* Data should be defined in milliseconds, default value - 1000;
* @since 1.577
*/
private
static
int
CACHE_REFRESH_PERIOD
=
Integer
.
getInteger
(
Queue
.
class
.
getName
()
+
".cacheRefreshPeriod"
,
1000
);
/**
* Items that are waiting for its quiet period to pass.
*
...
...
@@ -218,41 +211,6 @@ public class Queue extends ResourceController implements Saveable {
*/
private
final
Cache
<
Long
,
LeftItem
>
leftItems
=
CacheBuilder
.
newBuilder
().
expireAfterWrite
(
5
*
60
,
TimeUnit
.
SECONDS
).
build
();
private
final
CachedItemList
itemsView
=
new
CachedItemList
();
/**
* Maintains a copy of {@link Queue#getItems()}
*
* @see Queue#getApproximateItemsQuickly()
*/
private
class
CachedItemList
{
/**
* The current cached value.
*/
@CopyOnWrite
private
volatile
List
<
Item
>
itemsView
=
Collections
.
emptyList
();
/**
* When does the cache info expire?
*/
private
final
AtomicLong
expires
=
new
AtomicLong
();
List
<
Item
>
get
()
{
long
t
=
System
.
currentTimeMillis
();
long
d
=
expires
.
get
();
if
(
t
>
d
)
{
// need to refresh the cache
long
next
=
t
+
CACHE_REFRESH_PERIOD
;
if
(
expires
.
compareAndSet
(
d
,
next
))
{
// avoid concurrent cache update via CAS.
// if the getItems() lock is contended,
// some threads will end up serving stale data,
// but that's OK.
itemsView
=
ImmutableList
.
copyOf
(
getItems
());
}
}
return
itemsView
;
}
}
/**
* Data structure created for each idle {@link Executor}.
* This is a job offer from the queue to an executor.
...
...
@@ -864,9 +822,11 @@ public class Queue extends ResourceController implements Saveable {
* This method is primarily added to make UI threads run faster.
*
* @since 1.483
* @deprecated Use {@link #getItems()} directly. As of 1.607 the approximation is no longer needed.
*/
@Deprecated
public
List
<
Item
>
getApproximateItemsQuickly
()
{
return
itemsView
.
get
(
);
return
Arrays
.
asList
(
getItems
()
);
}
public
Item
getItem
(
long
id
)
{
...
...
core/src/main/java/hudson/model/View.java
浏览文件 @
5afddb1a
...
...
@@ -480,6 +480,11 @@ public abstract class View extends AbstractModelObject implements AccessControll
return
filterQueue
(
Arrays
.
asList
(
Jenkins
.
getInstance
().
getQueue
().
getItems
()));
}
/**
* @deprecated Use {@link #getQueueItems()}. As of 1.607 the approximation is no longer needed.
* @return The items in the queue.
*/
@Deprecated
public
List
<
Queue
.
Item
>
getApproximateQueueItemsQuickly
()
{
return
filterQueue
(
Jenkins
.
getInstance
().
getQueue
().
getApproximateItemsQuickly
());
}
...
...
core/src/main/java/hudson/widgets/BuildHistoryWidget.java
浏览文件 @
5afddb1a
...
...
@@ -63,7 +63,7 @@ public class BuildHistoryWidget<T> extends HistoryWidget<Task,T> {
*/
public
List
<
Item
>
getQueuedItems
()
{
LinkedList
<
Item
>
list
=
new
LinkedList
<
Item
>();
for
(
Item
item
:
Jenkins
.
getInstance
().
getQueue
().
get
ApproximateItemsQuickly
())
{
for
(
Item
item
:
Jenkins
.
getInstance
().
getQueue
().
get
Items
())
{
if
(
item
.
task
==
owner
)
{
list
.
addFirst
(
item
);
}
...
...
core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
浏览文件 @
5afddb1a
...
...
@@ -36,7 +36,7 @@ THE SOFTWARE.
<l:task href="new" icon="icon-new-computer icon-md" permission="${createPermission}" title="${%New Node}"/>
<l:task href="configure" icon="icon-setting icon-md" permission="${app.ADMINISTER}" title="${%Configure}"/>
</l:tasks>
<t:queue items="${app.queue.
approximateItemsQuickly
}" />
<t:queue items="${app.queue.
items
}" />
<t:executors />
</l:side-panel>
</j:jelly>
\ No newline at end of file
core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
浏览文件 @
5afddb1a
...
...
@@ -28,6 +28,6 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
<l:ajax>
<t:queue items="${it.
approximateQueueItemsQuickly
}" filtered="${it.isFilterQueue()}" />
<t:queue items="${it.
queueItems
}" filtered="${it.isFilterQueue()}" />
</l:ajax>
</j:jelly>
\ No newline at end of file
core/src/main/resources/jenkins/widgets/BuildQueueWidget/index.groovy
浏览文件 @
5afddb1a
...
...
@@ -2,4 +2,4 @@ package jenkins.widgets.BuildQueueWidget;
def
t
=
namespace
(
lib
.
JenkinsTagLib
.
class
)
t
.
queue
(
items:
view
.
approximateQueueItemsQuickly
,
it:
view
,
filtered:
view
.
filterQueue
)
t
.
queue
(
items:
view
.
queueItems
,
it:
view
,
filtered:
view
.
filterQueue
)
core/src/main/resources/lib/hudson/queue.jelly
浏览文件 @
5afddb1a
...
...
@@ -28,7 +28,7 @@ THE SOFTWARE.
Displays the build queue as <l:pane>
<st:attribute name="items" use="required">
Queue items to be displayed. Normally you should specify ${app.queue.
approximateItemsQuickly
},
Queue items to be displayed. Normally you should specify ${app.queue.
items
},
but for example you can specify a sublist after some filtering to narrow down
the list.
</st:attribute>
...
...
test/src/test/java/hudson/model/QueueTest.java
浏览文件 @
5afddb1a
...
...
@@ -404,7 +404,7 @@ public class QueueTest {
try
{
build
=
m
.
scheduleBuild2
(
0
).
get
(
60
,
TimeUnit
.
SECONDS
);
}
catch
(
TimeoutException
x
)
{
throw
(
AssertionError
)
new
AssertionError
(
r
.
jenkins
.
getQueue
().
get
ApproximateItemsQuickly
().
toString
()).
initCause
(
x
);
throw
(
AssertionError
)
new
AssertionError
(
r
.
jenkins
.
getQueue
().
get
Items
().
toString
()).
initCause
(
x
);
}
r
.
assertBuildStatusSuccess
(
build
);
assertEquals
(
""
,
build
.
getBuiltOnStr
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录