From 668a0cc4dc786dc1b6a726b17db74e9974afa82a Mon Sep 17 00:00:00 2001 From: Thomas Van Doren Date: Fri, 6 Apr 2012 20:33:10 -0700 Subject: [PATCH 1/3] [FIXED JENKINS-13378] Remove XML string writer from IOException2 when XPath error occurs. Remove XML string writer from IOException2 message when XPath error occurs in /api/xml request. The XML string writer has the potential to be very large (many megabytes or even gigabytes) and these exceptions will be logged to the default jenkins logfile by winstone. This has the potential to quickly use all available disk space if, for example, a jenkins poller (i.e. a chrome extension) makes frequent calls to the API that cause errors. --- core/src/main/java/hudson/model/Api.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java index 3ed37331a4..7c24378bda 100644 --- a/core/src/main/java/hudson/model/Api.java +++ b/core/src/main/java/hudson/model/Api.java @@ -139,7 +139,7 @@ public class Api extends AbstractModelObject { } } catch (DocumentException e) { - throw new IOException2("Failed to do XPath/wrapper handling. XML is as follows:"+sw,e); + throw new IOException2("Failed to do XPath/wrapper handling.",e); } OutputStream o = rsp.getCompressedOutputStream(req); From e1a1d3f098d938fb9c4690cd283653a91a496ae6 Mon Sep 17 00:00:00 2001 From: Thomas Van Doren Date: Sun, 8 Apr 2012 14:36:19 -0700 Subject: [PATCH 2/3] [JENKINS-13378] Add FINER logging of XML when XPath handling fails. --- core/src/main/java/hudson/model/Api.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Api.java b/core/src/main/java/hudson/model/Api.java index 7c24378bda..5fd8758f66 100644 --- a/core/src/main/java/hudson/model/Api.java +++ b/core/src/main/java/hudson/model/Api.java @@ -44,6 +44,8 @@ import java.io.OutputStream; import java.io.StringReader; import java.io.StringWriter; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Used to expose remote access API for ".../api/" @@ -139,7 +141,8 @@ public class Api extends AbstractModelObject { } } catch (DocumentException e) { - throw new IOException2("Failed to do XPath/wrapper handling.",e); + LOGGER.log(Level.FINER, "Failed to do XPath/wrapper handling. XML is as follows:"+sw, e); + throw new IOException2("Failed to do XPath/wrapper handling. Turn on FINER logging to view XML.",e); } OutputStream o = rsp.getCompressedOutputStream(req); @@ -188,5 +191,6 @@ public class Api extends AbstractModelObject { rsp.serveExposedBean(req,bean, Flavor.PYTHON); } + private static final Logger LOGGER = Logger.getLogger(Api.class.getName()); private static final ModelBuilder MODEL_BUILDER = new ModelBuilder(); } From 752a7c7b8bd357f2962c0b361eef465b1fd1c83f Mon Sep 17 00:00:00 2001 From: Thomas Van Doren Date: Mon, 9 Apr 2012 13:03:55 -0700 Subject: [PATCH 3/3] [JENKINS-13378] Update changelog.html with fix. --- changelog.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.html b/changelog.html index 5740a6da7a..96cd5623ff 100644 --- a/changelog.html +++ b/changelog.html @@ -55,6 +55,9 @@ Upcoming changes