Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-4643 - update to jdbc checkpoint to validate connection before declaring success, is more bullit proof in preventing an early restart even if start is now deferred till after stop completes

This commit is contained in:
gtully 2013-09-03 16:34:25 +01:00
parent 29453d6793
commit b588d6cb9b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
View File

@ -665,6 +665,9 @@ public class JDBCPersistenceAdapter extends DataSourceServiceSupport implements
Connection connection = null; Connection connection = null;
try { try {
connection = getDataSource().getConnection(); connection = getDataSource().getConnection();
if (!connection.isValid(10)) {
throw new IOException("isValid(10) failed for: " + connection);
}
} catch (SQLException e) { } catch (SQLException e) {
LOG.debug("Could not get JDBC connection for checkpoint: " + e); LOG.debug("Could not get JDBC connection for checkpoint: " + e);
throw IOExceptionSupport.create(e); throw IOExceptionSupport.create(e);

4
activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCTestMemory.java
View File

@ -27,6 +27,7 @@ import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.derby.jdbc.EmbeddedDataSource; import org.apache.derby.jdbc.EmbeddedDataSource;
import org.junit.Ignore;
public class JDBCTestMemory extends TestCase { public class JDBCTestMemory extends TestCase {
@ -82,7 +83,8 @@ public class JDBCTestMemory extends TestCase {
sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
dest = sess.createQueue("test"); dest = sess.createQueue("test");
} }
@Ignore("requires human input to terminate!")
public void testRecovery() throws Exception { public void testRecovery() throws Exception {
init(); init();
MessageProducer producer = sess.createProducer(dest); MessageProducer producer = sess.createProducer(dest);