diff --git a/Jenkinsfile b/Jenkinsfile index 822859a218c..46a9e2a3e91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { agent { node { label 'linux' } } options { timeout(time: 120, unit: 'MINUTES') } steps { - mavenBuild("jdk11", "-Pmongodb install", "maven3", true) // -Pautobahn + mavenBuild("jdk11", "-Pmongodb clean install", "maven3", true) // -Pautobahn // Collect up the jacoco execution results (only on main build) jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class', exclusionPattern: '' + @@ -44,7 +44,7 @@ pipeline { agent { node { label 'linux' } } steps { timeout(time: 120, unit: 'MINUTES') { - mavenBuild("jdk13", "-Pmongodb install", "maven3", true) + mavenBuild("jdk13", "-Pmongodb clean install", "maven3", true) warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']] junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml' } @@ -65,7 +65,7 @@ pipeline { agent { node { label 'linux' } } steps { timeout(time: 30, unit: 'MINUTES') { - mavenBuild("jdk11", "install -f build-resources", "maven3", true) + mavenBuild("jdk11", "clean install -f build-resources", "maven3", true) mavenBuild("jdk11", "install checkstyle:check -DskipTests", "maven3", true) recordIssues( enabledForFailure: true, aggregatingResults: true, diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java index 1d4ebaec7e7..84b69c3b406 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java @@ -68,7 +68,7 @@ public abstract class AbstractConnectionPool implements ConnectionPool, Dumpable } @ManagedAttribute(value = "The number of pending connections", readonly = true) - public int getPendingCount() + public int getPendingConnectionCount() { return connections.getHi(); } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java index bfccf42c6b3..d64c3c4dc39 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/DuplexConnectionPool.java @@ -309,9 +309,10 @@ public class DuplexConnectionPool extends AbstractConnectionPool implements Swee unlock(); } - return String.format("%s@%x[c=%d/%d,a=%d,i=%d]", + return String.format("%s@%x[c=%d/%d/%d,a=%d,i=%d]", getClass().getSimpleName(), hashCode(), + getPendingConnectionCount(), getConnectionCount(), getMaxConnectionCount(), activeSize, diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java index 389b05fd76e..5369d71b243 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java @@ -265,9 +265,10 @@ public class MultiplexConnectionPool extends AbstractConnectionPool implements C activeSize = activeConnections.size(); idleSize = idleConnections.size(); } - return String.format("%s@%x[connections=%d/%d,multiplex=%d,active=%d,idle=%d]", + return String.format("%s@%x[connections=%d/%d/%d,multiplex=%d,active=%d,idle=%d]", getClass().getSimpleName(), hashCode(), + getPendingConnectionCount(), getConnectionCount(), getMaxConnectionCount(), getMaxMultiplex(), diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/RoundRobinConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/RoundRobinConnectionPool.java index d16af4f2d87..18af0b085da 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/RoundRobinConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/RoundRobinConnectionPool.java @@ -214,9 +214,10 @@ public class RoundRobinConnectionPool extends AbstractConnectionPool implements } } } - return String.format("%s@%x[c=%d/%d,a=%d]", + return String.format("%s@%x[c=%d/%d/%d,a=%d]", getClass().getSimpleName(), hashCode(), + getPendingConnectionCount(), present, getMaxConnectionCount(), active diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java index 9e4fe6e44c5..d57225d3e53 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ManagedAttributeListener.java @@ -100,7 +100,6 @@ public class ManagedAttributeListener implements ServletContextListener, Servlet protected void updateBean(String name, Object oldBean, Object newBean) { - LOG.info("update {} {}->{} on {}", name, oldBean, newBean, _context); if (LOG.isDebugEnabled()) LOG.debug("update {} {}->{} on {}", name, oldBean, newBean, _context); _context.updateBean(oldBean, newBean, false);