in test explicitly setting maxThreads for ProxyServlet to work around https://tickets.puppetlabs.com/browse/TK-152

This commit is contained in:
Himanshu Gupta 2015-03-21 19:51:13 -05:00
parent bb9118319f
commit b5b32dbcb4
1 changed files with 24 additions and 23 deletions

View File

@ -154,8 +154,7 @@ public class AsyncQueryForwardingServletTest extends BaseJettyTest
} }
}; };
root.addServlet( ServletHolder holder = new ServletHolder(
new ServletHolder(
new AsyncQueryForwardingServlet( new AsyncQueryForwardingServlet(
injector.getInstance(ObjectMapper.class), injector.getInstance(ObjectMapper.class),
injector.getInstance(Key.get(ObjectMapper.class, Smile.class)), injector.getInstance(Key.get(ObjectMapper.class, Smile.class)),
@ -171,16 +170,18 @@ public class AsyncQueryForwardingServletTest extends BaseJettyTest
// noop // noop
} }
} }
) { )
{
@Override @Override
protected URI rewriteURI(HttpServletRequest request) protected URI rewriteURI(HttpServletRequest request)
{ {
URI uri = super.rewriteURI(request); URI uri = super.rewriteURI(request);
return URI.create(uri.toString().replace("/proxy", "")); return URI.create(uri.toString().replace("/proxy", ""));
} }
} });
), "/proxy/*" //NOTE: explicit maxThreads to workaround https://tickets.puppetlabs.com/browse/TK-152
); holder.setInitParameter("maxThreads", "256");
root.addServlet(holder, "/proxy/*");
JettyServerInitUtils.addExtensionFilters(root, injector); JettyServerInitUtils.addExtensionFilters(root, injector);
root.addFilter(JettyServerInitUtils.defaultAsyncGzipFilterHolder(), "/*", null); root.addFilter(JettyServerInitUtils.defaultAsyncGzipFilterHolder(), "/*", null);
root.addFilter(GuiceFilter.class, "/slow/*", null); root.addFilter(GuiceFilter.class, "/slow/*", null);