Fixed a race condition. The dead lock was between the transientActions object vs MavenModuleSet.

Found one Java-level deadlock:
=============================
"Handling GET /hudson/job/special_Build/api/json : http-8080-4":
  waiting to lock monitor 0x00000000460dfa98 (object 0x00002aab02808368, a java.util.Vector),
  which is held by "pool-6-thread-250"

"pool-6-thread-250":
  waiting to lock monitor 0x0000000046aca2b0 (object 0x00002aaab7099118, a hudson.maven.MavenModuleSet),
  which is held by "Handling GET /hudson/job/special_Build/api/json : http-8080-4"






"Handling GET /hudson/job/special_Build/api/json : http-8080-4":
        at java.util.Vector.toArray(Vector.java:643)
->      - waiting to lock <0x00002aab02808368> (a java.util.Vector)
        at java.util.Vector.addAll(Vector.java:830)
        - locked <0x00002aab02812710> (a java.util.Vector)
        at hudson.model.AbstractProject.getActions(AbstractProject.java:899)
->      - locked <0x00002aaab7099118> (a hudson.maven.MavenModuleSet)
        at sun.reflect.GeneratedMethodAccessor149.invoke(Unknown Source)
        at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
        at java.lang.reflect.Method.invoke(Method.java:597)
        at org.kohsuke.stapler.export.MethodProperty.getValue(MethodProperty.java:43)
        at org.kohsuke.stapler.export.Property.writeTo(Property.java:83)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:156)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeNestedObjectTo(Model.java:153)
        at org.kohsuke.stapler.export.Model.writeTo(Model.java:129)
        at org.kohsuke.stapler.ResponseImpl.serveExposedBean(ResponseImpl.java:176)
        at hudson.model.Api.doJson(Api.java:181)



"pool-6-thread-250":
        at hudson.model.AbstractProject.getActions(AbstractProject.java:898)
->      - waiting to lock <0x00002aaab7099118> (a hudson.maven.MavenModuleSet)
        at hudson.model.Actionable.getActions(Actionable.java:75)
        at hudson.plugins.jobConfigHistory.JobConfigHistoryActionFactory.createFor(JobConfigHistoryActionFactory.java:30)
        at hudson.model.AbstractProject.updateTransientActions(AbstractProject.java:549)
        at hudson.maven.AbstractMavenProject.updateTransientActions(AbstractMavenProject.java:48)
->      - locked <0x00002aab02808368> (a java.util.Vector)
        at hudson.maven.MavenModuleSet.updateTransientActions(MavenModuleSet.java:199)
        at hudson.maven.MavenModuleSetBuild.notifyModuleBuild(MavenModuleSetBuild.java:347)
        - locked <0x00002aab0103d910> (a hudson.maven.MavenModuleSetBuild)
        at hudson.maven.MavenBuild$ProxyImpl2.end(MavenBuild.java:437)
        at sun.reflect.GeneratedMethodAccessor368.invoke(Unknown Source)

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@35610 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2010-10-07 18:59:21 +00:00
1 parent 7ae17dfa5d
commit 0c6138c6af
6 files changed
+76 -50

No files matched your search

@@ -195,8 +195,9 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
return getItem(name);
}
protected void updateTransientActions() {
super.updateTransientActions();
protected List<Action> createTransientActions() {
List<Action> r = super.createTransientActions();
// Fix for ISSUE-1149
for (MavenModule module: modules.values()) {
module.updateTransientActions();
@@ -204,20 +205,22 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
if(publishers!=null) // this method can be loaded from within the onLoad method, where this might be null
for (BuildStep step : publishers)
transientActions.addAll(step.getProjectActions(this));
r.addAll(step.getProjectActions(this));
if (buildWrappers!=null)
for (BuildWrapper step : buildWrappers)
transientActions.addAll(step.getProjectActions(this));
r.addAll(step.getProjectActions(this));
return r;
}
protected void addTransientActionsFromBuild(MavenModuleSetBuild build, Set<Class> added) {
protected void addTransientActionsFromBuild(MavenModuleSetBuild build, List<Action> collection, Set<Class> added) {
if(build==null) return;
for (Action a : build.getActions())
if(a instanceof MavenAggregatedReport)
if(added.add(a.getClass()))
transientActions.add(((MavenAggregatedReport)a).getProjectAction(this));
collection.add(((MavenAggregatedReport)a).getProjectAction(this));
List<MavenReporter> list = build.projectActionReporters;
if(list==null) return;
@@ -226,7 +229,7 @@ public final class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,Ma
if(!added.add(step.getClass())) continue; // already added
Action a = step.getAggregatedProjectAction(this);
if(a!=null)
transientActions.add(a);
collection.add(a);
}
}