Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Jan Bartel 2016-07-07 14:32:18 +10:00
parent 8675c17d92 008912fd5e
commit 6b778f9f0e
4 changed files with 79 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
View File

@ -7,8 +7,8 @@
<Array type="java.net.InetSocketAddress">
<Item>
<New class="java.net.InetSocketAddress">
<Arg><Property name="jetty.session.memcache.host" default="localhost"/></Arg>
<Arg type="int"><Property name="jetty.session.memcache.port" default="11211"/></Arg>
<Arg><Property name="jetty.session.memcache.host"><Default><Env name="MEMCACHE_PORT_11211_TCP_ADDR" default="localhost"/></Default></Property></Arg>
<Arg type="int"><Property name="jetty.session.memcache.port"><Default><Env name="MEMCACHE_PORT_11211_TCP_PORT" default="11211"/></Default></Property></Arg>
</New>
</Item>
<!-- Add more here -->
@ -21,5 +21,6 @@
</Array>
</Set>
<Set name="expirySec"><Property name="jetty.session.memcache.expirySec" default="0"/></Set>
<Set name="heartbeats"><Property name="jetty.session.memcache.heartbeats" default="true"/></Set>
</New>
</Configure>

14
jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMap.java
View File

@ -43,6 +43,7 @@ public class MemcachedSessionDataMap extends AbstractLifeCycle implements Sessio
public static final String DEFAULT_PORT = "11211";
protected MemcachedClient _client;
protected int _expirySec = 0;
protected boolean _heartbeats = true;
protected XMemcachedClientBuilder _builder;
@ -92,6 +93,18 @@ public class MemcachedSessionDataMap extends AbstractLifeCycle implements Sessio
public boolean isHeartbeats()
{
return _heartbeats;
}
public void setHeartbeats(boolean heartbeats)
{
_heartbeats = heartbeats;
}
/**
* @see org.eclipse.jetty.server.session.SessionDataMap#initialize(org.eclipse.jetty.server.session.SessionContext)
*/
@ -101,6 +114,7 @@ public class MemcachedSessionDataMap extends AbstractLifeCycle implements Sessio
try
{
_client = _builder.build();
_client.setEnableHeartBeat(isHeartbeats());
}
catch (IOException e)
{

12
jetty-memcached/jetty-memcached-sessions/src/main/java/org/eclipse/jetty/memcached/session/MemcachedSessionDataMapFactory.java
View File

@ -33,6 +33,7 @@ import org.eclipse.jetty.server.session.SessionDataMapFactory;
public class MemcachedSessionDataMapFactory implements SessionDataMapFactory
{
protected int _expiry;
protected boolean _heartbeats = true;
protected int[] _weights;
protected List<InetSocketAddress> _addresses;
@ -71,6 +72,16 @@ public class MemcachedSessionDataMapFactory implements SessionDataMapFactory
_expiry = expiry;
}
public boolean isHeartbeats()
{
return _heartbeats;
}
public void setHeartbeats(boolean heartbeats)
{
_heartbeats = heartbeats;
}
/**
* @see org.eclipse.jetty.server.session.SessionDataMapFactory#getSessionDataMap()
*/
@ -79,6 +90,7 @@ public class MemcachedSessionDataMapFactory implements SessionDataMapFactory
{
MemcachedSessionDataMap m = new MemcachedSessionDataMap(_addresses, _weights);
m.setExpirySec(_expiry);
m.setHeartbeats(isHeartbeats());
return m;
}

78
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java
View File

@ -18,10 +18,18 @@
package org.eclipse.jetty.servlets;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.concurrent.CountDownLatch;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import javax.servlet.DispatcherType;
@ -50,7 +58,6 @@ public class QoSFilterTest
private ServletTester _tester;
private LocalConnector[] _connectors;
private CountDownLatch _doneRequests;
private final int NUM_CONNECTIONS = 8;
private final int NUM_LOOPS = 6;
private final int MAX_QOS = 4;
@ -68,8 +75,6 @@ public class QoSFilterTest
for (int i = 0; i < _connectors.length; ++i)
_connectors[i] = _tester.createLocalConnector();
_doneRequests = new CountDownLatch(NUM_CONNECTIONS * NUM_LOOPS);
_tester.start();
}
@ -82,17 +87,21 @@ public class QoSFilterTest
@Test
public void testNoFilter() throws Exception
{
List<Worker> workers = new ArrayList<>();
for (int i = 0; i < NUM_CONNECTIONS; ++i)
{
new Thread(new Worker(i)).start();
workers.add(new Worker(i));
}
_doneRequests.await(10, TimeUnit.SECONDS);
ExecutorService executor = Executors.newFixedThreadPool(NUM_CONNECTIONS);
List<Future<Void>> futures = executor.invokeAll(workers, 10, TimeUnit.SECONDS);
rethrowExceptions(futures);
if (TestServlet.__maxSleepers <= MAX_QOS)
LOG.warn("TEST WAS NOT PARALLEL ENOUGH!");
else
Assert.assertThat(TestServlet.__maxSleepers, Matchers.lessThanOrEqualTo(NUM_CONNECTIONS));
assertThat(TestServlet.__maxSleepers, Matchers.lessThanOrEqualTo(NUM_CONNECTIONS));
}
@Test
@ -103,12 +112,17 @@ public class QoSFilterTest
holder.setInitParameter(QoSFilter.MAX_REQUESTS_INIT_PARAM, "" + MAX_QOS);
_tester.getContext().getServletHandler().addFilterWithMapping(holder, "/*", EnumSet.of(DispatcherType.REQUEST, DispatcherType.ASYNC));
List<Worker> workers = new ArrayList<>();
for (int i = 0; i < NUM_CONNECTIONS; ++i)
{
new Thread(new Worker(i)).start();
workers.add(new Worker(i));
}
_doneRequests.await(10, TimeUnit.SECONDS);
ExecutorService executor = Executors.newFixedThreadPool(NUM_CONNECTIONS);
List<Future<Void>> futures = executor.invokeAll(workers, 10, TimeUnit.SECONDS);
rethrowExceptions(futures);
if (TestServlet.__maxSleepers < MAX_QOS)
LOG.warn("TEST WAS NOT PARALLEL ENOUGH!");
else
@ -123,19 +137,32 @@ public class QoSFilterTest
holder.setInitParameter(QoSFilter.MAX_REQUESTS_INIT_PARAM, String.valueOf(MAX_QOS));
_tester.getContext().getServletHandler().addFilterWithMapping(holder, "/*", EnumSet.of(DispatcherType.REQUEST, DispatcherType.ASYNC));
List<Worker2> workers = new ArrayList<>();
for (int i = 0; i < NUM_CONNECTIONS; ++i)
{
new Thread(new Worker2(i)).start();
workers.add(new Worker2(i));
}
_doneRequests.await(20, TimeUnit.SECONDS);
ExecutorService executor = Executors.newFixedThreadPool(NUM_CONNECTIONS);
List<Future<Void>> futures = executor.invokeAll(workers, 20, TimeUnit.SECONDS);
rethrowExceptions(futures);
if (TestServlet.__maxSleepers < MAX_QOS)
LOG.warn("TEST WAS NOT PARALLEL ENOUGH!");
else
Assert.assertEquals(TestServlet.__maxSleepers, MAX_QOS);
}
class Worker implements Runnable
private void rethrowExceptions(List<Future<Void>> futures) throws Exception
{
for (Future<Void> future : futures)
{
future.get();
}
}
class Worker implements Callable<Void>
{
private int _num;
@ -145,7 +172,7 @@ public class QoSFilterTest
}
@Override
public void run()
public Void call() throws Exception
{
for (int i = 0; i < NUM_LOOPS; i++)
{
@ -155,23 +182,17 @@ public class QoSFilterTest
request.setHeader("host", "tester");
request.setURI("/context/test?priority=" + (_num % QoSFilter.__DEFAULT_MAX_PRIORITY));
request.setHeader("num", _num + "");
try
{
String responseString = _connectors[_num].getResponses(BufferUtil.toString(request.generate()));
if (responseString.contains("HTTP"))
{
_doneRequests.countDown();
}
}
catch (Exception x)
{
Assert.assertTrue(false);
}
String responseString = _connectors[_num].getResponse(BufferUtil.toString(request.generate()));
assertThat("Response contains", responseString, containsString("HTTP"));
}
return null;
}
}
class Worker2 implements Runnable
class Worker2 implements Callable<Void>
{
private int _num;
@ -181,7 +202,7 @@ public class QoSFilterTest
}
@Override
public void run()
public Void call() throws Exception
{
URL url = null;
try
@ -191,13 +212,14 @@ public class QoSFilterTest
{
url = new URL(addr + "/context/test?priority=" + (_num % QoSFilter.__DEFAULT_MAX_PRIORITY) + "&n=" + _num + "&l=" + i);
url.getContent();
_doneRequests.countDown();
}
}
catch (Exception e)
{
LOG.debug("Request " + url + " failed", e);
}
return null;
}
}