Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
bf444887
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,发现更多精彩内容 >>
提交
bf444887
编写于
8月 27, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-19377] ViewJob.removeRun must take effect synchronously or LogRotator gets confused.
上级
1d20c524
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
113 addition
and
3 deletion
+113
-3
changelog.html
changelog.html
+3
-1
core/src/main/java/hudson/model/ViewJob.java
core/src/main/java/hudson/model/ViewJob.java
+7
-2
test/src/test/java/hudson/model/ViewJobTest.java
test/src/test/java/hudson/model/ViewJobTest.java
+103
-0
未找到文件。
changelog.html
浏览文件 @
bf444887
...
...
@@ -55,7 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
>
<li
class=
bug
>
Deleting an external run did not immediately remove it from build list, leading to errors from log rotation.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-19377"
>
issue 19377
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/src/main/java/hudson/model/ViewJob.java
浏览文件 @
bf444887
...
...
@@ -33,6 +33,8 @@ import java.util.LinkedHashSet;
import
java.util.SortedMap
;
import
hudson.model.Descriptor.FormException
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
/**
* {@link Job} that monitors activities that happen outside Hudson,
...
...
@@ -46,6 +48,8 @@ import hudson.model.Descriptor.FormException;
public
abstract
class
ViewJob
<
JobT
extends
ViewJob
<
JobT
,
RunT
>,
RunT
extends
Run
<
JobT
,
RunT
>>
extends
Job
<
JobT
,
RunT
>
{
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
ViewJob
.
class
.
getName
());
/**
* We occasionally update the list of {@link Run}s from a file system.
* The next scheduled update time.
...
...
@@ -126,8 +130,9 @@ public abstract class ViewJob<JobT extends ViewJob<JobT,RunT>, RunT extends Run<
}
public
void
removeRun
(
RunT
run
)
{
// reload the info next time
nextUpdate
=
0
;
if
(
runs
!=
null
&&
!
runs
.
remove
(
run
))
{
LOGGER
.
log
(
Level
.
WARNING
,
"{0} did not contain {1} to begin with"
,
new
Object
[]
{
this
,
run
});
}
}
private
void
_reload
()
{
...
...
test/src/test/java/hudson/model/ViewJobTest.java
0 → 100644
浏览文件 @
bf444887
/*
* The MIT License
*
* Copyright 2013 Jesse Glick.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
hudson.model
;
import
java.io.File
;
import
java.io.IOException
;
import
jenkins.model.Jenkins
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.Bug
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.TestExtension
;
public
class
ViewJobTest
{
@Rule
public
JenkinsRule
rule
=
new
JenkinsRule
();
@Bug
(
19377
)
@Test
public
void
removeRun
()
throws
Exception
{
J
j
=
rule
.
jenkins
.
createProject
(
J
.
class
,
"j"
);
R
r1
=
j
.
nue
();
R
r2
=
j
.
nue
();
assertEquals
(
"[2, 1]"
,
j
.
getBuildsAsMap
().
keySet
().
toString
());
j
.
removeRun
(
r1
);
assertEquals
(
"[2]"
,
j
.
getBuildsAsMap
().
keySet
().
toString
());
}
@SuppressWarnings
({
"rawtypes"
,
"unchecked"
,
"deprecation"
})
public
static
final
class
J
extends
ViewJob
<
J
,
R
>
implements
TopLevelItem
{
public
J
(
ItemGroup
parent
,
String
name
)
{
super
(
parent
,
name
);
}
@Override
protected
void
reload
()
{
runs
.
load
(
this
,
new
RunMap
.
Constructor
<
R
>()
{
@Override
public
R
create
(
File
d
)
throws
IOException
{
return
new
R
(
J
.
this
,
d
);
}
});
}
@Override
public
TopLevelItemDescriptor
getDescriptor
()
{
return
Jenkins
.
getInstance
().
getDescriptorByType
(
DescriptorImpl
.
class
);
}
@TestExtension
public
static
final
class
DescriptorImpl
extends
TopLevelItemDescriptor
{
@Override
public
String
getDisplayName
()
{
return
"J"
;
}
@Override
public
TopLevelItem
newInstance
(
ItemGroup
parent
,
String
name
)
{
return
new
J
(
parent
,
name
);
}
}
R
nue
()
throws
IOException
{
R
r
=
new
R
(
this
);
_getRuns
();
runs
.
put
(
r
);
return
r
;
}
}
public
static
final
class
R
extends
Run
<
J
,
R
>
{
public
R
(
J
j
)
throws
IOException
{
super
(
j
);
}
public
R
(
J
j
,
File
d
)
throws
IOException
{
super
(
j
,
d
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录