{
};
}
+ /**
+ * Sets the base build from which this build is derived.
+ * @since 1.416
+ */
+ public void setBaseBuild(MatrixBuild baseBuild) {
+ this.baseBuild = (baseBuild==null || baseBuild==getPreviousBuild()) ? null : baseBuild.getNumber();
+ }
+
+ /**
+ * Returns the base {@link MatrixBuild} that this build originates from.
+ *
+ * If this build is a partial build, unexecuted {@link MatrixRun}s are delegated to this build number.
+ */
+ public MatrixBuild getBaseBuild() {
+ return baseBuild==null ? getPreviousBuild() : getParent().getBuildByNumber(baseBuild);
+ }
+
/**
* Gets the {@link MatrixRun} in this build that corresponds
* to the given combination.
@@ -119,9 +142,9 @@ public class MatrixBuild extends AbstractBuild {
public MatrixRun getRun(Combination c) {
MatrixConfiguration config = getParent().getItem(c);
if(config==null) return null;
- return config.getNearestOldBuild(getNumber());
+ return getRunForConfiguration(config);
}
-
+
/**
* Returns all {@link MatrixRun}s for this {@link MatrixBuild}.
*/
@@ -129,11 +152,19 @@ public class MatrixBuild extends AbstractBuild {
public List getRuns() {
List r = new ArrayList();
for(MatrixConfiguration c : getParent().getItems()) {
- MatrixRun b = c.getNearestOldBuild(getNumber());
+ MatrixRun b = getRunForConfiguration(c);
if (b != null) r.add(b);
}
return r;
}
+
+ private MatrixRun getRunForConfiguration(MatrixConfiguration c) {
+ for (MatrixBuild b=this; b!=null; b=b.getBaseBuild()) {
+ MatrixRun r = c.getBuildByNumber(b.getNumber());
+ if (r!=null) return r;
+ }
+ return null;
+ }
/**
* Returns all {@link MatrixRun}s for this {@link MatrixBuild}.
diff --git a/core/src/main/java/hudson/model/ResultTrend.java b/core/src/main/java/hudson/model/ResultTrend.java
new file mode 100644
index 0000000000..87f8a986df
--- /dev/null
+++ b/core/src/main/java/hudson/model/ResultTrend.java
@@ -0,0 +1,180 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2011, Christoph Kutzinski
+ *
+ * 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 org.jvnet.localizer.Localizable;
+
+import java.util.Locale;
+
+/**
+ * Describes an {@link Result} trend by taking the comparing the result of the current and the previous build.
+ *
+ * @author kutzi
+ * @since 1.416
+ */
+public enum ResultTrend {
+ /**
+ * Previous build was {@link Result#FAILURE} or {@link Result#UNSTABLE}
+ * and is now {@link Result#SUCCESS}.
+ */
+ FIXED(Messages._ResultTrend_Fixed()),
+ /**
+ * Build as well as previous build (if it has a previous build) are {@link Result#SUCCESS}
+ */
+ SUCCESS(Messages._ResultTrend_Success()),
+ /**
+ * Previous build was {@link Result#FAILURE} and is now 'only' {@link Result#UNSTABLE}.
+ */
+ NOW_UNSTABLE(Messages._ResultTrend_NowUnstable()),
+ /**
+ * Build as well as previous build are {@link Result#UNSTABLE}.
+ */
+ STILL_UNSTABLE(Messages._ResultTrend_StillUnstable()),
+ /**
+ * Previous build (if there is one) was {@link Result#SUCCESS} and current build is {@link Result#UNSTABLE}.
+ */
+ UNSTABLE(Messages._ResultTrend_Unstable()),
+ /**
+ * Build as well as previous build are {@link Result#FAILURE}.
+ */
+ STILL_FAILING(Messages._ResultTrend_StillFailing()),
+ /**
+ * Previous build (if there is one) was {@link Result#SUCCESS} or {@link Result#UNSTABLE}
+ * and current build is {@link Result#UNSTABLE}.
+ */
+ FAILURE(Messages._ResultTrend_Failure()),
+ /**
+ * Build was aborted.
+ */
+ ABORTED(Messages._ResultTrend_Aborted()),
+ /**
+ * Build didn't run (yet).
+ */
+ NOT_BUILT(Messages._ResultTrend_NotBuilt());
+
+ private final Localizable description;
+
+ private ResultTrend(Localizable description) {
+ this.description = description;
+ }
+
+ /**
+ * Returns a short human-readable description of the result.
+ */
+ public String getDescription() {
+ return this.description.toString();
+ }
+
+ /**
+ * Gets all upper case ID like token of the build status.
+ */
+ public String getID() {
+ return this.description.toString(Locale.ENGLISH).toUpperCase(Locale.ENGLISH);
+ }
+
+ /**
+ * Returns the result trend of a build.
+ *
+ * @param build the current build
+ * @return the result trend
+ */
+ public static ResultTrend getResultTrend(AbstractBuild build) {
+ Result result = build.getResult();
+
+ if (result == Result.ABORTED) {
+ return ABORTED;
+ } else if (result == Result.NOT_BUILT) {
+ return NOT_BUILT;
+ }
+
+ if (result == Result.SUCCESS) {
+ if (isFix(build)) {
+ return FIXED;
+ } else {
+ return SUCCESS;
+ }
+ }
+
+ AbstractBuild previousBuild = getPreviousNonAbortedBuild(build);
+ if (result == Result.UNSTABLE) {
+ if (previousBuild == null) {
+ return UNSTABLE;
+ }
+
+
+ if (previousBuild.getResult() == Result.UNSTABLE) {
+ return STILL_UNSTABLE;
+ } else if (previousBuild.getResult() == Result.FAILURE) {
+ return NOW_UNSTABLE;
+ } else {
+ return UNSTABLE;
+ }
+ } else if (result == Result.FAILURE) {
+ if (previousBuild != null && previousBuild.getResult() == Result.FAILURE) {
+ return STILL_FAILING;
+ } else {
+ return FAILURE;
+ }
+ }
+
+ throw new IllegalArgumentException("Unknown result: '" + result + "' for build: " + build);
+ }
+
+ /**
+ * Returns the previous 'not aborted' build (i.e. ignores ABORTED and NOT_BUILT builds)
+ * or null.
+ */
+ private static AbstractBuild getPreviousNonAbortedBuild(AbstractBuild build) {
+ AbstractBuild previousBuild = build.getPreviousBuild();
+ while (previousBuild != null) {
+ if (previousBuild.getResult() == null
+ || previousBuild.getResult() == Result.ABORTED
+ || previousBuild.getResult() == Result.NOT_BUILT) {
+
+ previousBuild = previousBuild.getPreviousBuild();
+ } else {
+ return previousBuild;
+ }
+ }
+ return previousBuild;
+ }
+
+ /**
+ * Returns true if this build represents a 'fix'.
+ * I.e. it is the first successful build after previous
+ * 'failed' and/or 'unstable' builds.
+ * Ignores 'aborted' and 'not built' builds.
+ */
+ private static boolean isFix(AbstractBuild build) {
+ if (build.getResult() != Result.SUCCESS) {
+ return false;
+ }
+
+ AbstractBuild previousBuild = getPreviousNonAbortedBuild(build);
+ if (previousBuild != null) {
+ return previousBuild.getResult().isWorseThan(Result.SUCCESS);
+ }
+ return false;
+ }
+}
diff --git a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java
index 185697af50..c3cfbb5c8e 100644
--- a/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java
+++ b/core/src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java
@@ -267,6 +267,8 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher {
afterDisconnect(computer,listener);
}
});
+ //destroy session to free the socket
+ JISession.destroySession(session);
} catch (SmbException e) {
e.printStackTrace(listener.error(e.getMessage()));
} catch (JIException e) {
@@ -315,6 +317,8 @@ public class ManagedWindowsServiceLauncher extends ComputerLauncher {
listener.getLogger().println(Messages.ManagedWindowsServiceLauncher_StoppingService());
slaveService.StopService();
}
+ //destroy session to free the socket
+ JISession.destroySession(session);
} catch (UnknownHostException e) {
e.printStackTrace(listener.error(e.getMessage()));
} catch (JIException e) {
diff --git a/core/src/main/java/hudson/slaves/NodeProvisioner.java b/core/src/main/java/hudson/slaves/NodeProvisioner.java
index 48993d1db4..257b04de82 100644
--- a/core/src/main/java/hudson/slaves/NodeProvisioner.java
+++ b/core/src/main/java/hudson/slaves/NodeProvisioner.java
@@ -23,12 +23,9 @@
*/
package hudson.slaves;
-import hudson.model.LoadStatistics;
-import hudson.model.Node;
+import hudson.model.*;
import jenkins.model.Jenkins;
-import hudson.model.MultiStageTimeSeries;
-import hudson.model.Label;
-import hudson.model.PeriodicWork;
+
import static hudson.model.LoadStatistics.DECAY;
import hudson.model.MultiStageTimeSeries.TimeScale;
import hudson.Extension;
@@ -40,6 +37,7 @@ import java.util.List;
import java.util.Collection;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.io.IOException;
@@ -86,6 +84,8 @@ public class NodeProvisioner {
private List pendingLaunches = new ArrayList();
+ private transient volatile long lastSuggestedReview;
+
/**
* Exponential moving average of the "planned capacity" over time, which is the number of
* additional executors being brought up.
@@ -112,15 +112,33 @@ public class NodeProvisioner {
return new ArrayList(pendingLaunches);
}
+ /**
+ * Give the {@link NodeProvisioner} a hint that now would be a good time to think about provisioning some nodes.
+ * The hint will be ignored if subjected to excessive pestering by callers.
+ *
+ * @since 1.415
+ */
+ public void suggestReviewNow() {
+ if (System.currentTimeMillis() > lastSuggestedReview + TimeUnit.SECONDS.toMillis(1)) {
+ lastSuggestedReview = System.currentTimeMillis();
+ Computer.threadPoolForRemoting.submit(new Runnable() {
+ public void run() {
+ update();
+ }
+ });
+ }
+ }
+
/**
* Periodically invoked to keep track of the load.
* Launches additional nodes if necessary.
*/
private synchronized void update() {
Jenkins hudson = Jenkins.getInstance();
+ lastSuggestedReview = System.currentTimeMillis();
// clean up the cancelled launch activity, then count the # of executors that we are about to bring up.
- float plannedCapacity = 0;
+ int plannedCapacitySnapshot = 0;
for (Iterator itr = pendingLaunches.iterator(); itr.hasNext();) {
PlannedNode f = itr.next();
if(f.future.isDone()) {
@@ -136,8 +154,9 @@ public class NodeProvisioner {
}
itr.remove();
} else
- plannedCapacity += f.numExecutors;
+ plannedCapacitySnapshot += f.numExecutors;
}
+ float plannedCapacity = plannedCapacitySnapshot;
plannedCapacitiesEMA.update(plannedCapacity);
/*
@@ -174,8 +193,9 @@ public class NodeProvisioner {
int idleSnapshot = stat.computeIdleExecutors();
int totalSnapshot = stat.computeTotalExecutors();
+ boolean needSomeWhenNoneAtAll = ((totalSnapshot + plannedCapacity) == 0) && (stat.computeQueueLength() > 0);
float idle = Math.max(stat.getLatestIdleExecutors(TIME_SCALE), idleSnapshot);
- if(idle1-m) {// and there's more work to do...
LOGGER.fine("Excess workload "+excessWorkload+" detected. (planned capacity="+plannedCapacity+",Qlen="+qlen+",idle="+idle+"&"+idleSnapshot+",total="+totalSnapshot+"m,="+m+")");
diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index 8568111377..da211c04d7 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -381,7 +381,7 @@ public class Maven extends Builder {
@DataBoundConstructor
public MavenInstallation(String name, String home, List> properties) {
- super(name, home, properties);
+ super(Util.fixEmptyAndTrim(name), Util.fixEmptyAndTrim(home), properties);
}
/**
diff --git a/core/src/main/java/hudson/tasks/junit/SuiteResult.java b/core/src/main/java/hudson/tasks/junit/SuiteResult.java
index d5783c8a02..06761acc97 100644
--- a/core/src/main/java/hudson/tasks/junit/SuiteResult.java
+++ b/core/src/main/java/hudson/tasks/junit/SuiteResult.java
@@ -25,6 +25,7 @@ package hudson.tasks.junit;
import hudson.tasks.test.TestObject;
import hudson.util.IOException2;
+import hudson.util.io.ParserConfigurator;
import org.apache.commons.io.FileUtils;
import org.dom4j.Document;
import org.dom4j.DocumentException;
@@ -84,20 +85,30 @@ public final class SuiteResult implements Serializable {
this.file = null;
}
+ /**
+ * Passed to {@link ParserConfigurator}.
+ * @since 1.416
+ */
+ public static class SuiteResultParserConfigurationContext {
+ public final File xmlReport;
+
+ SuiteResultParserConfigurationContext(File xmlReport) {
+ this.xmlReport = xmlReport;
+ }
+ }
+
/**
* Parses the JUnit XML file into {@link SuiteResult}s.
* This method returns a collection, as a single XML may have multiple <testsuite>
* elements wrapped into the top-level <testsuites>.
*/
- static List parse(File xmlReport, boolean keepLongStdio) throws DocumentException, IOException {
+ static List parse(File xmlReport, boolean keepLongStdio) throws DocumentException, IOException, InterruptedException {
List r = new ArrayList();
// parse into DOM
SAXReader saxReader = new SAXReader();
- // install EntityResolver for resolving DTDs, which are in files created by TestNG.
- // (see https://hudson.dev.java.net/servlets/ReadMsg?listName=users&msgNo=5530)
- XMLEntityResolver resolver = new XMLEntityResolver();
- saxReader.setEntityResolver(resolver);
+ ParserConfigurator.applyConfiguration(saxReader,new SuiteResultParserConfigurationContext(xmlReport));
+
Document result = saxReader.read(xmlReport);
Element root = result.getRootElement();
diff --git a/core/src/main/java/hudson/tasks/junit/TestResult.java b/core/src/main/java/hudson/tasks/junit/TestResult.java
index 44e3122294..43f6c98738 100644
--- a/core/src/main/java/hudson/tasks/junit/TestResult.java
+++ b/core/src/main/java/hudson/tasks/junit/TestResult.java
@@ -199,6 +199,8 @@ public final class TestResult extends MetaTabulatedResult {
try {
for (SuiteResult suiteResult : SuiteResult.parse(reportFile, keepLongStdio))
add(suiteResult);
+ } catch (InterruptedException e) {
+ throw new IOException2("Failed to read "+reportFile,e);
} catch (RuntimeException e) {
throw new IOException2("Failed to read "+reportFile,e);
} catch (DocumentException e) {
diff --git a/core/src/main/java/hudson/tasks/junit/XMLEntityResolver.java b/core/src/main/java/hudson/tasks/junit/XMLEntityResolver.java
index 52ca72a234..823c02a219 100644
--- a/core/src/main/java/hudson/tasks/junit/XMLEntityResolver.java
+++ b/core/src/main/java/hudson/tasks/junit/XMLEntityResolver.java
@@ -23,6 +23,10 @@
*/
package hudson.tasks.junit;
+import hudson.Extension;
+import hudson.tasks.junit.SuiteResult.SuiteResultParserConfigurationContext;
+import hudson.util.io.ParserConfigurator;
+import org.dom4j.io.SAXReader;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -43,7 +47,8 @@ import java.util.logging.Logger;
*
* @author Mikael Carneholm
*/
-class XMLEntityResolver implements EntityResolver {
+@Extension
+public class XMLEntityResolver extends ParserConfigurator implements EntityResolver {
private static final String TESTNG_NAMESPACE = "http://testng.org/";
@@ -67,5 +72,16 @@ class XMLEntityResolver implements EntityResolver {
return null;
}
+ /**
+ * Install EntityResolver for resolving DTDs, which are in files created by TestNG.
+ * (see https://hudson.dev.java.net/servlets/ReadMsg?listName=users&msgNo=5530)
+ */
+ @Override
+ public void configure(SAXReader reader, Object context) {
+ if (context instanceof SuiteResultParserConfigurationContext) {
+ reader.setEntityResolver(this);
+ }
+ }
+
private static final Logger LOGGER = Logger.getLogger(XMLEntityResolver.class.getName());
}
\ No newline at end of file
diff --git a/core/src/main/java/hudson/util/io/ParserConfigurator.java b/core/src/main/java/hudson/util/io/ParserConfigurator.java
new file mode 100644
index 0000000000..97907a8937
--- /dev/null
+++ b/core/src/main/java/hudson/util/io/ParserConfigurator.java
@@ -0,0 +1,89 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2011, CloudBees, Inc.
+ *
+ * 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.util.io;
+
+import hudson.ExtensionList;
+import hudson.ExtensionPoint;
+import hudson.model.Hudson;
+import hudson.remoting.Callable;
+import hudson.remoting.Channel;
+import org.dom4j.io.SAXReader;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * Configures XML parsers to be used for various XML parsing activities inside Jenkins.
+ *
+ *
+ * XML parsing is a complex enough activity that often certain degree of customization of the
+ * parsing behaviour is desired. This extension point enables that. To avoid creating
+ * new extension point for each different parsing scene, this extension point takes the type-less
+ * "context" argument, which should identify the context of the parse by type.
+ *
+ *
+ * This extension point is added late in the game, so existing XML parsing behaviour should
+ * be retrofitted to use this as we find them. Similarly, additional overloaded versions are likely
+ * needed to support SAX, JAXP, and other means of parsing.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 1.416
+ */
+public abstract class ParserConfigurator implements ExtensionPoint, Serializable {
+ /**
+ * Configures the given {@link SAXReader}
+ *
+ * @param context
+ * Object that represents the context in which the parser is used.
+ * It is up to the caller to decide what to pass in here.
+ */
+ public void configure(SAXReader reader, Object context) {}
+
+ /**
+ * Returns all the registered {@link ParserConfigurator}s.
+ */
+ public static ExtensionList all() {
+ return Hudson.getInstance().getExtensionList(ParserConfigurator.class);
+ }
+
+ public static void applyConfiguration(SAXReader reader, Object context) throws IOException, InterruptedException {
+ Collection all = Collections.emptyList();
+
+ if (Hudson.getInstance()==null) {
+ Channel ch = Channel.current();
+ if (ch!=null)
+ all = ch.call(new Callable, IOException>() {
+ public Collection call() throws IOException {
+ return new ArrayList(all());
+ }
+ });
+ } else
+ all = all();
+ for (ParserConfigurator pc : all)
+ pc.configure(reader,context);
+ }
+}
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly
index f5260e426e..904d3d6c1f 100644
--- a/core/src/main/resources/hudson/PluginManager/advanced.jelly
+++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly
@@ -48,7 +48,7 @@ THE SOFTWARE.
-
+
diff --git a/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties b/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties
index 25cc20ec66..81fb8b60fc 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties
+++ b/core/src/main/resources/hudson/model/AbstractProject/main_ja.properties
@@ -21,7 +21,7 @@
# THE SOFTWARE.
Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9
-Recent\ Changes=\u5909\u66f4\u5c65\u6b74s
+Recent\ Changes=\u5909\u66f4\u5c65\u6b74
Last\ Successful\ Artifacts=\u6700\u65b0\u6210\u529f\u30d3\u30eb\u30c9\u306e\u6210\u679c\u7269
Latest\ Test\ Result=\u6700\u65b0\u306e\u30c6\u30b9\u30c8\u7d50\u679c
Latest\ Aggregated\ Test\ Result=\u6700\u65b0\u306e\u96c6\u7d04\u3055\u308c\u305f\u30c6\u30b9\u30c8\u7d50\u679c
diff --git a/core/src/main/resources/hudson/model/Hudson/newView.jelly b/core/src/main/resources/hudson/model/Hudson/newView.jelly
index 68ca7e9183..e8a49b03a8 100644
--- a/core/src/main/resources/hudson/model/Hudson/newView.jelly
+++ b/core/src/main/resources/hudson/model/Hudson/newView.jelly
@@ -33,7 +33,7 @@ THE SOFTWARE.
-