Skip to content

WIP: [NO-JIRA] KahaDBOffsetRecoveryListenerTest execution time improvements #1560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattrpav wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: [NO-JIRA] KahaDBOffsetRecoveryListenerTest execution time improvements #1560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions ...ests/src/test/java/org/apache/activemq/store/kahadb/KahaDBOffsetRecoveryListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.activemq.store.kahadb;

import java.io.File;
Expand All @@ -30,6 +29,7 @@
import org.apache.activemq.store.MessageRecoveryContext;
import org.apache.activemq.store.MessageRecoveryListener;
import org.apache.activemq.store.MessageStore;
import org.apache.activemq.util.IOHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
Expand Down Expand Up @@ -57,13 +57,13 @@ public class KahaDBOffsetRecoveryListenerTest {
@Rule
public TestName testName = new TestName();

protected final int PRETEST_MSG_COUNT = 17531;
protected final int PRETEST_MSG_COUNT = 7531;

@Before
public void beforeEach() throws Exception {
// Send+Recv a odd number of messages beyond cache sizes
// to confirm the queue's sequence number gets pushed off
sendMessages(PRETEST_MSG_COUNT, testName.getMethodName());
sendMessages(PRETEST_MSG_COUNT, testName.getMethodName(), true);
assertEquals(Integer.valueOf(PRETEST_MSG_COUNT), Integer.valueOf(receiveMessages(testName.getMethodName())));
}

Expand All @@ -85,7 +85,7 @@ protected BrokerService createBroker(KahaDBStore kaha) throws Exception {
private KahaDBStore createStore(boolean delete) throws IOException {
KahaDBStore kaha = new KahaDBStore();
kaha.setJournalMaxFileLength(1024*100);
kaha.setDirectory(new File("target" + File.separator + "activemq-data" + File.separator + "kahadb-recovery-tests"));
kaha.setDirectory(new File(IOHelper.getDefaultDataDirectory(), "kahadb-recovery-tests"));
if( delete ) {
kaha.deleteAllMessages();
}
Expand All @@ -99,8 +99,7 @@ protected void runOffsetTest(final int sendCount, final int expectedMessageCount
protected void runOffsetLoopTest(final int sendCount, final int expectedMessageCount, final int recoverOffset, final int recoverCount, final int expectedRecoverCount, final int expectedRecoverIndex, final String queueName, final int loopCount, final boolean repeatExpected) throws Exception {
KahaDBStore kahaDBStore = createStore(true);
brokerService = createBroker(kahaDBStore);
sendMessages(sendCount, queueName);

sendMessages(sendCount, queueName, false);
MessageStore messageStore = kahaDBStore.createQueueMessageStore(new ActiveMQQueue(queueName));

int tmpExpectedRecoverCount = expectedRecoverCount;
Expand Down Expand Up @@ -187,8 +186,12 @@ public void testOffsetRepeat() throws Exception {
runOffsetLoopTest(10_000, 10_000, 7_000, 133, 133, 7_000, testName.getMethodName(), 10, true);
}

private void sendMessages(int count, String queueName) throws JMSException {
private void sendMessages(int count, String queueName, boolean sendAsync) throws JMSException {
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost");
if(sendAsync) {
cf.setProducerWindowSize(800000);
cf.setUseAsyncSend(true);
}
cf.setWatchTopicAdvisories(false);

Connection connection = cf.createConnection();
Expand Down