Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
d1d52486
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,发现更多精彩内容 >>
提交
d1d52486
编写于
7月 29, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-18895] MavenModuleSetBuild.getResult is expensive.
上级
1f23168c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
37 addition
and
5 deletion
+37
-5
changelog.html
changelog.html
+3
-0
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
...lugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+12
-2
test/src/main/java/org/jvnet/hudson/test/RunLoadCounter.java
test/src/main/java/org/jvnet/hudson/test/RunLoadCounter.java
+10
-2
test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java
.../test/java/hudson/maven/MavenBuildSurefireFailedTest.java
+12
-1
未找到文件。
changelog.html
浏览文件 @
d1d52486
...
@@ -61,6 +61,9 @@ Upcoming changes</a>
...
@@ -61,6 +61,9 @@ Upcoming changes</a>
<li
class=
bug
>
<li
class=
bug
>
Maven build failure wasn't describing errors like Maven CLI does.
Maven build failure wasn't describing errors like Maven CLI does.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15025"
>
issue 15025
</a>
)
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15025"
>
issue 15025
</a>
)
<li
class=
bug
>
<code>
MavenModuleSetBuild.getResult
</code>
is expensive.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-18895"
>
issue 18895
</a>
)
<li
class=
bug
>
<li
class=
bug
>
Revisited fix to be compatible for plugins.
Revisited fix to be compatible for plugins.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-18119"
>
issue 18119
</a>
)
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-18119"
>
issue 18119
</a>
)
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
浏览文件 @
d1d52486
...
@@ -53,7 +53,6 @@ import hudson.model.Result;
...
@@ -53,7 +53,6 @@ import hudson.model.Result;
import
hudson.model.Run
;
import
hudson.model.Run
;
import
hudson.model.StringParameterDefinition
;
import
hudson.model.StringParameterDefinition
;
import
hudson.model.TaskListener
;
import
hudson.model.TaskListener
;
import
hudson.remoting.Callable
;
import
hudson.remoting.VirtualChannel
;
import
hudson.remoting.VirtualChannel
;
import
hudson.scm.ChangeLogSet
;
import
hudson.scm.ChangeLogSet
;
import
hudson.tasks.BuildStep
;
import
hudson.tasks.BuildStep
;
...
@@ -93,7 +92,6 @@ import jenkins.mvn.SettingsProvider;
...
@@ -93,7 +92,6 @@ import jenkins.mvn.SettingsProvider;
import
org.apache.commons.io.FilenameUtils
;
import
org.apache.commons.io.FilenameUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.maven.artifact.versioning.ComparableVersion
;
import
org.apache.maven.artifact.versioning.ComparableVersion
;
import
org.apache.maven.model.building.ModelBuildingRequest
;
import
org.apache.maven.project.MavenProject
;
import
org.apache.maven.project.MavenProject
;
import
org.apache.maven.project.ProjectBuildingException
;
import
org.apache.maven.project.ProjectBuildingException
;
import
org.codehaus.plexus.util.PathTool
;
import
org.codehaus.plexus.util.PathTool
;
...
@@ -136,6 +134,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
...
@@ -136,6 +134,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
private
String
mavenVersionUsed
;
private
String
mavenVersionUsed
;
private
transient
Object
notifyModuleBuildLock
=
new
Object
();
private
transient
Object
notifyModuleBuildLock
=
new
Object
();
private
transient
Result
effectiveResult
;
public
MavenModuleSetBuild
(
MavenModuleSet
job
)
throws
IOException
{
public
MavenModuleSetBuild
(
MavenModuleSet
job
)
throws
IOException
{
super
(
job
);
super
(
job
);
...
@@ -194,6 +193,11 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
...
@@ -194,6 +193,11 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
*/
*/
@Override
@Override
public
Result
getResult
()
{
public
Result
getResult
()
{
synchronized
(
notifyModuleBuildLock
)
{
if
(
effectiveResult
!=
null
)
{
return
effectiveResult
;
}
}
Result
r
=
super
.
getResult
();
Result
r
=
super
.
getResult
();
for
(
MavenBuild
b
:
getModuleLastBuilds
().
values
())
{
for
(
MavenBuild
b
:
getModuleLastBuilds
().
values
())
{
...
@@ -208,6 +212,11 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
...
@@ -208,6 +212,11 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
r
=
r
.
combine
(
br
);
r
=
r
.
combine
(
br
);
}
}
synchronized
(
notifyModuleBuildLock
)
{
if
(
effectiveResult
==
null
)
{
effectiveResult
=
r
;
}
}
return
r
;
return
r
;
}
}
...
@@ -522,6 +531,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
...
@@ -522,6 +531,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
// use a separate lock object since this synchronized block calls into plugins,
// use a separate lock object since this synchronized block calls into plugins,
// which in turn can access other MavenModuleSetBuild instances, which will result in a dead lock.
// which in turn can access other MavenModuleSetBuild instances, which will result in a dead lock.
synchronized
(
notifyModuleBuildLock
)
{
synchronized
(
notifyModuleBuildLock
)
{
effectiveResult
=
null
;
boolean
modified
=
false
;
boolean
modified
=
false
;
List
<
Action
>
actions
=
getActions
();
List
<
Action
>
actions
=
getActions
();
...
...
test/src/main/java/org/jvnet/hudson/test/RunLoadCounter.java
浏览文件 @
d1d52486
...
@@ -50,12 +50,16 @@ public final class RunLoadCounter {
...
@@ -50,12 +50,16 @@ public final class RunLoadCounter {
/**
/**
* Prepares a new project to be measured.
* Prepares a new project to be measured.
*
Call this <em>before</em> starting builds
.
*
Usually called before starting builds, but may also be called retroactively
.
* @param project a project of any kind
* @param project a project of any kind
* @throws IOException if preparations fail
* @throws IOException if preparations fail
*/
*/
public
static
void
prepare
(
AbstractProject
<?,?>
project
)
throws
IOException
{
public
static
void
prepare
(
AbstractProject
<?,?>
project
)
throws
IOException
{
project
.
getPublishersList
().
add
(
new
MarkerAdder
());
project
.
getPublishersList
().
add
(
new
MarkerAdder
());
for
(
AbstractBuild
<?,?>
build
:
project
.
_getRuns
())
{
Marker
.
add
(
build
);
build
.
save
();
}
}
}
/**
/**
...
@@ -97,6 +101,10 @@ public final class RunLoadCounter {
...
@@ -97,6 +101,10 @@ public final class RunLoadCounter {
@Restricted
(
NoExternalUse
.
class
)
@Restricted
(
NoExternalUse
.
class
)
public
static
final
class
Marker
implements
RunAction
{
public
static
final
class
Marker
implements
RunAction
{
static
void
add
(
AbstractBuild
<?,?>
build
)
{
build
.
addAction
(
new
Marker
(
build
.
getParent
().
getFullName
(),
build
.
getNumber
()));
}
private
final
String
project
;
private
final
String
project
;
private
final
int
build
;
private
final
int
build
;
...
@@ -137,7 +145,7 @@ public final class RunLoadCounter {
...
@@ -137,7 +145,7 @@ public final class RunLoadCounter {
public
static
final
class
MarkerAdder
extends
Notifier
{
public
static
final
class
MarkerAdder
extends
Notifier
{
@Override
public
boolean
perform
(
AbstractBuild
<?,
?>
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
@Override
public
boolean
perform
(
AbstractBuild
<?,
?>
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
build
.
addAction
(
new
Marker
(
build
.
getParent
().
getFullName
(),
build
.
getNumber
())
);
Marker
.
add
(
build
);
return
true
;
return
true
;
}
}
...
...
test/src/test/java/hudson/maven/MavenBuildSurefireFailedTest.java
浏览文件 @
d1d52486
...
@@ -2,10 +2,12 @@ package hudson.maven;
...
@@ -2,10 +2,12 @@ package hudson.maven;
import
hudson.model.Result
;
import
hudson.model.Result
;
import
hudson.tasks.Shell
;
import
hudson.tasks.Shell
;
import
java.util.concurrent.Callable
;
import
org.jvnet.hudson.test.Bug
;
import
org.jvnet.hudson.test.Bug
;
import
org.jvnet.hudson.test.ExtractResourceSCM
;
import
org.jvnet.hudson.test.ExtractResourceSCM
;
import
org.jvnet.hudson.test.HudsonTestCase
;
import
org.jvnet.hudson.test.HudsonTestCase
;
import
org.jvnet.hudson.test.RunLoadCounter
;
/**
/**
* @author Olivier Lamy
* @author Olivier Lamy
...
@@ -24,10 +26,19 @@ public class MavenBuildSurefireFailedTest extends HudsonTestCase {
...
@@ -24,10 +26,19 @@ public class MavenBuildSurefireFailedTest extends HudsonTestCase {
@Bug
(
8415
)
@Bug
(
8415
)
public
void
testMaven2Failed
()
throws
Exception
{
public
void
testMaven2Failed
()
throws
Exception
{
configureDefaultMaven
();
configureDefaultMaven
();
MavenModuleSet
m
=
createMavenProject
();
final
MavenModuleSet
m
=
createMavenProject
();
m
.
setGoals
(
"test -Dmaven.test.failure.ignore=false"
);
m
.
setGoals
(
"test -Dmaven.test.failure.ignore=false"
);
m
.
setScm
(
new
ExtractResourceSCM
(
getClass
().
getResource
(
"maven-multimodule-unit-failure.zip"
)));
m
.
setScm
(
new
ExtractResourceSCM
(
getClass
().
getResource
(
"maven-multimodule-unit-failure.zip"
)));
assertBuildStatus
(
Result
.
FAILURE
,
m
.
scheduleBuild2
(
0
).
get
());
assertBuildStatus
(
Result
.
FAILURE
,
m
.
scheduleBuild2
(
0
).
get
());
// JENKINS-18895:
MavenModule
failing
=
m
.
getModule
(
"com.mycompany.app:my-app"
);
assertEquals
(
Result
.
FAILURE
,
failing
.
getLastBuild
().
getResult
());
RunLoadCounter
.
prepare
(
failing
);
assertEquals
(
Result
.
FAILURE
,
RunLoadCounter
.
assertMaxLoads
(
failing
,
0
,
new
Callable
<
Result
>()
{
@Override
public
Result
call
()
throws
Exception
{
return
m
.
getLastBuild
().
getResult
();
}
}));
}
}
@Bug
(
8415
)
@Bug
(
8415
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录