mirror of https://github.com/apache/activemq.git
apply fix for: https://issues.apache.org/jira/browse/AMQ-3482 to return default behavior to blocking.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1164058 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish
parent
588a3c3594
commit
5ac1540c63
|
|
@ -66,7 +66,7 @@ public class PooledConnectionFactory implements ConnectionFactory, Service {
|
|||
private int maximumActive = 500;
|
||||
private int maxConnections = 1;
|
||||
private int idleTimeout = 30 * 1000;
|
||||
private boolean blockIfSessionPoolIsFull = false;
|
||||
private boolean blockIfSessionPoolIsFull = true;
|
||||
private AtomicBoolean stopped = new AtomicBoolean(false);
|
||||
private long expiryTimeout = 0l;
|
||||
|
||||
|
|
@ -197,23 +197,19 @@ public class PooledConnectionFactory implements ConnectionFactory, Service {
|
|||
}
|
||||
|
||||
/**
|
||||
* Controls the behavior of the internal session pool.
|
||||
* By default the call to Connection.getSession() will
|
||||
* return a JMSException if the session pool is full.
|
||||
* If the argument true is given, it will change the
|
||||
* default behavior and instead the call to getSession()
|
||||
* will block until a session is available in the pool, which
|
||||
* used to be the default behavior in ActiveMQ versions < 5.6.
|
||||
* Controls the behavior of the internal session pool. By default the call to
|
||||
* Connection.getSession() will block if the session pool is full. If the
|
||||
* argument false is given, it will change the default behavior and instead the
|
||||
* call to getSession() will throw a JMSException.
|
||||
*
|
||||
* The size of the session pool is controlled by the @see #maximumActive
|
||||
* property.
|
||||
*
|
||||
* @param block - if true, the call to getSession() blocks if the pool
|
||||
* is full until a session object is available.
|
||||
* defaults to false.
|
||||
* @param block - if true, the call to getSession() blocks if the pool is full
|
||||
* until a session object is available. defaults to true.
|
||||
*/
|
||||
public void setBlockIfSessionPoolIsFull(boolean block) {
|
||||
this.blockIfSessionPoolIsFull = block;
|
||||
this.blockIfSessionPoolIsFull = block;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -237,14 +233,14 @@ public class PooledConnectionFactory implements ConnectionFactory, Service {
|
|||
* @return the newly created but empty ObjectPoolFactory
|
||||
*/
|
||||
protected ObjectPoolFactory createPoolFactory() {
|
||||
if (blockIfSessionPoolIsFull) {
|
||||
return new GenericObjectPoolFactory(null, maximumActive);
|
||||
} else {
|
||||
return new GenericObjectPoolFactory(null,
|
||||
maximumActive,
|
||||
GenericObjectPool.WHEN_EXHAUSTED_FAIL,
|
||||
GenericObjectPool.DEFAULT_MAX_WAIT);
|
||||
}
|
||||
if (blockIfSessionPoolIsFull) {
|
||||
return new GenericObjectPoolFactory(null, maximumActive);
|
||||
} else {
|
||||
return new GenericObjectPoolFactory(null,
|
||||
maximumActive,
|
||||
GenericObjectPool.WHEN_EXHAUSTED_FAIL,
|
||||
GenericObjectPool.DEFAULT_MAX_WAIT);
|
||||
}
|
||||
}
|
||||
|
||||
public int getIdleTimeout() {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ import org.apache.log4j.Logger;
|
|||
*/
|
||||
public class PooledConnectionFactoryTest extends TestCase
|
||||
{
|
||||
public final static Logger LOG = Logger.getLogger(PooledConnectionFactoryTest.class);
|
||||
public final static Logger LOG = Logger.getLogger(PooledConnectionFactoryTest.class);
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -54,94 +54,86 @@ public class PooledConnectionFactoryTest extends TestCase
|
|||
|
||||
/**
|
||||
* Tests the behavior of the sessionPool of the PooledConnectionFactory
|
||||
* when maximum number of sessions are reached. In older versions the call to
|
||||
* Connection.createSession() would simply block indefinitely if the maximum
|
||||
* number of sessions got reached (controled by
|
||||
* PooledConnectionFactory.setMaximumActive()).
|
||||
* Rather than blocking the entire thread, it should raise an exception
|
||||
* instead.
|
||||
* when maximum number of sessions are reached.
|
||||
*/
|
||||
public void testApp() throws Exception
|
||||
{
|
||||
// using separate thread for testing so that we can interrupt the test
|
||||
// if the call to get a new session blocks.
|
||||
// using separate thread for testing so that we can interrupt the test
|
||||
// if the call to get a new session blocks.
|
||||
|
||||
// start test runner thread
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
Future<Boolean> result = (Future<Boolean>) executor.submit(new TestRunner());
|
||||
// start test runner thread
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
Future<Boolean> result = (Future<Boolean>) executor.submit(new TestRunner());
|
||||
|
||||
// test should not take > 5secs, so test fails i
|
||||
Thread.sleep(5*1000);
|
||||
// test should not take > 5secs, so test fails i
|
||||
Thread.sleep(5*1000);
|
||||
|
||||
if (!result.isDone() || !result.get().booleanValue()) {
|
||||
PooledConnectionFactoryTest.LOG.error("2nd call to createSession()" +
|
||||
" is blocking but should have returned an error instead.");
|
||||
if (!result.isDone() || !result.get().booleanValue()) {
|
||||
PooledConnectionFactoryTest.LOG.error("2nd call to createSession()" +
|
||||
" is blocking but should have returned an error instead.");
|
||||
|
||||
executor.shutdownNow();
|
||||
executor.shutdownNow();
|
||||
|
||||
Assert.fail("SessionPool inside PooledConnectionFactory is blocking if " +
|
||||
"limit is exceeded but should return an exception instead.");
|
||||
}
|
||||
Assert.fail("SessionPool inside PooledConnectionFactory is blocking if " +
|
||||
"limit is exceeded but should return an exception instead.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class TestRunner implements Callable<Boolean> {
|
||||
|
||||
public final static Logger LOG = Logger.getLogger(TestRunner.class);
|
||||
public final static Logger LOG = Logger.getLogger(TestRunner.class);
|
||||
|
||||
/**
|
||||
* @return true if test succeeded, false otherwise
|
||||
*/
|
||||
public Boolean call() {
|
||||
/**
|
||||
* @return true if test succeeded, false otherwise
|
||||
*/
|
||||
public Boolean call() {
|
||||
|
||||
Connection conn = null;
|
||||
Session one = null;
|
||||
Connection conn = null;
|
||||
Session one = null;
|
||||
|
||||
// wait at most 5 seconds for the call to createSession
|
||||
try {
|
||||
ActiveMQConnectionFactory amq = new ActiveMQConnectionFactory("vm://broker1?marshal=false&broker.persistent=false");
|
||||
PooledConnectionFactory cf = new PooledConnectionFactory(amq);
|
||||
cf.setMaxConnections(3);
|
||||
cf.setMaximumActive(1);
|
||||
// wait at most 5 seconds for the call to createSession
|
||||
try {
|
||||
ActiveMQConnectionFactory amq = new ActiveMQConnectionFactory("vm://broker1?marshal=false&broker.persistent=false");
|
||||
PooledConnectionFactory cf = new PooledConnectionFactory(amq);
|
||||
cf.setMaxConnections(3);
|
||||
cf.setMaximumActive(1);
|
||||
cf.setBlockIfSessionPoolIsFull(false);
|
||||
|
||||
// default should be false already but lets make sure a change to the default
|
||||
// setting does not make this test fail.
|
||||
cf.setBlockIfSessionPoolIsFull(false);
|
||||
conn = cf.createConnection();
|
||||
one = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
|
||||
|
||||
conn = cf.createConnection();
|
||||
one = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
|
||||
Session two = null;
|
||||
try {
|
||||
// this should raise an exception as we called setMaximumActive(1)
|
||||
two = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
|
||||
two.close();
|
||||
|
||||
Session two = null;
|
||||
try {
|
||||
// this should raise an exception as we called setMaximumActive(1)
|
||||
two = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
|
||||
two.close();
|
||||
LOG.error("Expected JMSException wasn't thrown.");
|
||||
Assert.fail("seconds call to Connection.createSession() was supposed" +
|
||||
"to raise an JMSException as internal session pool" +
|
||||
"is exhausted. This did not happen and indiates a problem");
|
||||
return new Boolean(false);
|
||||
} catch (JMSException ex) {
|
||||
if (ex.getCause().getClass() == java.util.NoSuchElementException.class) {
|
||||
//expected, ignore but log
|
||||
LOG.info("Caught expected " + ex);
|
||||
} else {
|
||||
LOG.error(ex);
|
||||
return new Boolean(false);
|
||||
}
|
||||
} finally {
|
||||
if (one != null)
|
||||
one.close();
|
||||
if (conn != null)
|
||||
conn.close();
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
LOG.error(ex.getMessage());
|
||||
return new Boolean(false);
|
||||
}
|
||||
|
||||
LOG.error("Expected JMSException wasn't thrown.");
|
||||
Assert.fail("seconds call to Connection.createSession() was supposed" +
|
||||
"to raise an JMSException as internal session pool" +
|
||||
"is exhausted. This did not happen and indiates a problem");
|
||||
return new Boolean(false);
|
||||
} catch (JMSException ex) {
|
||||
if (ex.getCause().getClass() == java.util.NoSuchElementException.class) {
|
||||
//expected, ignore but log
|
||||
LOG.info("Caught expected " + ex);
|
||||
} else {
|
||||
LOG.error(ex);
|
||||
return new Boolean(false);
|
||||
}
|
||||
} finally {
|
||||
if (one != null)
|
||||
one.close();
|
||||
if (conn != null)
|
||||
conn.close();
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
LOG.error(ex.getMessage());
|
||||
return new Boolean(false);
|
||||
}
|
||||
|
||||
// all good, test succeeded
|
||||
return new Boolean(true);
|
||||
}
|
||||
// all good, test succeeded
|
||||
return new Boolean(true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue