From cca741275ef61f2f1652f66bdcfc22a92e3edebb Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Thu, 30 Mar 2017 22:04:44 +1100 Subject: [PATCH] implements fail fast when sending request fail #13 Signed-off-by: olivier lamy --- .../java/org/mortbay/jetty/load/generator/LoadGenerator.java | 1 + .../java/org/mortbay/jetty/load/generator/FailFastTest.java | 1 - .../load/generator/starter/AbstractLoadGeneratorStarter.java | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/LoadGenerator.java b/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/LoadGenerator.java index dd2022d1..1a9ec74b 100644 --- a/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/LoadGenerator.java +++ b/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/LoadGenerator.java @@ -294,6 +294,7 @@ public void failed(Throwable x) { logger.debug("failed tree for {}", resource); } callback.failed(x); + LoadGenerator.this.interrupt(); } }, nodes); Sender sender = new Sender(client, warmup, treeCallback); diff --git a/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/FailFastTest.java b/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/FailFastTest.java index 9e9f5b74..0a974d7e 100644 --- a/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/FailFastTest.java +++ b/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/FailFastTest.java @@ -149,7 +149,6 @@ protected void service( HttpServletRequest request, HttpServletResponse response { throw new RuntimeException( e.getMessage(), e ); } - } response.getOutputStream().write( "Jetty rocks!!".getBytes() ); response.flushBuffer(); diff --git a/jetty-load-generator-starter/src/main/java/org/mortbay/jetty/load/generator/starter/AbstractLoadGeneratorStarter.java b/jetty-load-generator-starter/src/main/java/org/mortbay/jetty/load/generator/starter/AbstractLoadGeneratorStarter.java index 96eff864..f0751bdd 100644 --- a/jetty-load-generator-starter/src/main/java/org/mortbay/jetty/load/generator/starter/AbstractLoadGeneratorStarter.java +++ b/jetty-load-generator-starter/src/main/java/org/mortbay/jetty/load/generator/starter/AbstractLoadGeneratorStarter.java @@ -81,6 +81,11 @@ public void run() .warmupIterationsPerThread( starterArgs.getWarmupNumber() ) // .scheme( starterArgs.getScheme() ); // + if (starterArgs.getThreads() > 0) + { + loadGeneratorBuilder.threads( starterArgs.getThreads() ); + } + if ( starterArgs.getMaxRequestsQueued() > 0 ) { loadGeneratorBuilder.maxRequestsQueued( starterArgs.getMaxRequestsQueued() );