Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FIXED JENKINS-20892] /{view,computer,user}/*/builds & /job/*/buildTi…
…meTrend block HTTP response on build record loading. Merge branch 'lazy-build-lists-JENKINS-20892'
- Loading branch information
Showing
12 changed files
with
273 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * 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 jenkins.widgets; | ||
|
|
||
| import hudson.Functions; | ||
| import hudson.model.BallColor; | ||
| import hudson.model.Run; | ||
| import net.sf.json.JSONObject; | ||
| import org.kohsuke.accmod.Restricted; | ||
| import org.kohsuke.accmod.restrictions.DoNotUse; | ||
|
|
||
| @Restricted(DoNotUse.class) // only for buildListTable.jelly | ||
| public class BuildListTable extends RunListProgressiveRendering { | ||
|
|
||
| @Override protected void calculate(Run<?,?> build, JSONObject element) { | ||
| BallColor iconColor = build.getIconColor(); | ||
| element.put("iconColorOrdinal", iconColor.ordinal()); | ||
| element.put("iconColorDescription", iconColor.getDescription()); | ||
| element.put("url", build.getUrl()); | ||
| element.put("buildStatusUrl", build.getBuildStatusUrl()); | ||
| element.put("parentUrl", build.getParent().getUrl()); | ||
| element.put("parentFullDisplayName", Functions.breakableString(Functions.escape(build.getParent().getFullDisplayName()))); | ||
| element.put("displayName", build.getDisplayName()); | ||
| element.put("timestampString", build.getTimestampString()); | ||
| element.put("timestampString2", build.getTimestampString2()); | ||
| Run.Summary buildStatusSummary = build.getBuildStatusSummary(); | ||
| element.put("buildStatusSummaryWorse", buildStatusSummary.isWorse); | ||
| element.put("buildStatusSummaryMessage", buildStatusSummary.message); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * 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 jenkins.widgets; | ||
|
|
||
| import hudson.model.AbstractBuild; | ||
| import hudson.model.BallColor; | ||
| import hudson.model.Node; | ||
| import hudson.model.Run; | ||
| import jenkins.model.Jenkins; | ||
| import net.sf.json.JSONObject; | ||
| import org.kohsuke.accmod.Restricted; | ||
| import org.kohsuke.accmod.restrictions.DoNotUse; | ||
|
|
||
| @Restricted(DoNotUse.class) // only for buildTimeTrend.jelly | ||
| public class BuildTimeTrend extends RunListProgressiveRendering { | ||
|
|
||
| @Override protected void calculate(Run<?,?> build, JSONObject element) { | ||
| BallColor iconColor = build.getIconColor(); | ||
| element.put("iconColorOrdinal", iconColor.ordinal()); | ||
| element.put("iconColorDescription", iconColor.getDescription()); | ||
| element.put("buildStatusUrl", build.getBuildStatusUrl()); | ||
| element.put("number", build.getNumber()); | ||
| element.put("displayName", build.getDisplayName()); | ||
| element.put("duration", build.getDuration()); | ||
| element.put("durationString", build.getDurationString()); | ||
| if (build instanceof AbstractBuild) { | ||
| AbstractBuild<?,?> b = (AbstractBuild) build; | ||
| Node n = b.getBuiltOn(); | ||
| if (n == null) { | ||
| String ns = b.getBuiltOnStr(); | ||
| if (ns != null && !ns.isEmpty()) { | ||
| element.put("builtOnStr", ns); | ||
| } | ||
| } else if (n != Jenkins.getInstance()) { | ||
| element.put("builtOn", n.getNodeName()); | ||
| element.put("builtOnStr", n.getDisplayName()); | ||
| } else { | ||
| element.put("builtOnStr", hudson.model.Messages.Hudson_Computer_DisplayName()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
81 changes: 81 additions & 0 deletions
81
core/src/main/java/jenkins/widgets/RunListProgressiveRendering.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * 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 jenkins.widgets; | ||
|
|
||
| import hudson.model.Run; | ||
| import hudson.util.RunList; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import jenkins.util.ProgressiveRendering; | ||
| import net.sf.json.JSON; | ||
| import net.sf.json.JSONArray; | ||
| import net.sf.json.JSONObject; | ||
| import org.kohsuke.accmod.Restricted; | ||
| import org.kohsuke.accmod.restrictions.NoExternalUse; | ||
|
|
||
| /** | ||
| * Makes it possible to incrementally render some information from a {@link RunList}. | ||
| */ | ||
| @Restricted(NoExternalUse.class) | ||
| public abstract class RunListProgressiveRendering extends ProgressiveRendering { | ||
|
|
||
| /** | ||
| * Since we cannot predict how many runs there will be, just show an ever-growing progress bar. | ||
| * The first increment will be sized as if this many runs will be in the total, | ||
| * but then like Zeno’s paradox we will never seem to finish until we actually do. | ||
| */ | ||
| private static final double MAX_LIKELY_RUNS = 20; | ||
| private final List<JSONObject> results = new ArrayList<JSONObject>(); | ||
| private Iterable<? extends Run<?,?>> builds; | ||
|
|
||
| /** Jelly cannot call a constructor with arguments. */ | ||
| public void setBuilds(Iterable<? extends Run<?,?>> builds) { | ||
| this.builds = builds; | ||
| } | ||
|
|
||
| @Override protected void compute() throws Exception { | ||
| double decay = 1; | ||
| for (Run<?,?> build : builds) { | ||
| if (canceled()) { | ||
| return; | ||
| } | ||
| JSONObject element = new JSONObject(); | ||
| calculate(build, element); | ||
| synchronized (results) { | ||
| results.add(element); | ||
| } | ||
| decay *= (1 - 1 / MAX_LIKELY_RUNS); | ||
| progress(1 - decay); | ||
| } | ||
| } | ||
|
|
||
| @Override protected synchronized JSON data() { | ||
| JSONArray d = JSONArray.fromObject(results); | ||
| results.clear(); | ||
| return d; | ||
| } | ||
|
|
||
| protected abstract void calculate(Run<?,?> build, JSONObject element); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.