Skip to content
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

Fix/dlq timestamp #7

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

Fix/dlq timestamp #7

Show file tree
Hide file tree
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
22 changes: 14 additions & 8 deletions src/main/java/org/logstash/input/DeadLetterQueueInputPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.logstash.ackedqueue.Queueable;
import org.logstash.common.io.DeadLetterQueueReader;

import java.io.Closeable;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.file.Files;
Expand All @@ -34,7 +35,7 @@
import java.util.function.Consumer;


public class DeadLetterQueueInputPlugin {
public class DeadLetterQueueInputPlugin implements Closeable {
private static final Logger logger = LogManager.getLogger(DeadLetterQueueInputPlugin.class);

private final static char VERSION = '1';
Expand All @@ -57,9 +58,13 @@ public DeadLetterQueueReader getQueueReader() {
}

public void register() throws IOException {
if (sinceDbPath != null && Files.exists(sinceDbPath) && targetTimestamp == null) {
if (sinceDbPath != null && Files.exists(sinceDbPath)) {
byte[] bytes = Files.readAllBytes(sinceDbPath);

if (bytes.length == 0) {
if (targetTimestamp != null) {
queueReader.seekToNextEvent(targetTimestamp);
}
return;
}
ByteBuffer buffer = ByteBuffer.wrap(bytes);
Expand Down Expand Up @@ -87,7 +92,6 @@ public void run(Consumer<Queueable> queueConsumer) throws Exception {
}

private void writeOffsets(Path segment, long offset) throws IOException {
logger.info("writing offsets");
String path = segment.toAbsolutePath().toString();
ByteBuffer buffer = ByteBuffer.allocate(path.length() + 1 + 64);
buffer.putChar(VERSION);
Expand All @@ -97,12 +101,14 @@ private void writeOffsets(Path segment, long offset) throws IOException {
Files.write(sinceDbPath, buffer.array());
}

@Override
public void close() throws IOException {
logger.warn("closing dead letter queue input plugin");
if (commitOffsets) {
writeOffsets(queueReader.getCurrentSegment(), queueReader.getCurrentPosition());
if (open.get()) {
if (commitOffsets) {
writeOffsets(queueReader.getCurrentSegment(), queueReader.getCurrentPosition());
}
queueReader.close();
open.set(false);
}
queueReader.close();
open.set(false);
}
}
172 changes: 127 additions & 45 deletions src/test/java/org/logstash/input/DeadLetterQueueInputPluginTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@
*/
package org.logstash.input;

import org.joda.time.DateTime;
import java.io.IOException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.logstash.DLQEntry;
import org.logstash.Event;
import org.logstash.Timestamp;

import org.logstash.common.io.DeadLetterQueueWriter;

import java.nio.file.Path;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.LongAdder;

import static junit.framework.TestCase.assertEquals;

Expand All @@ -46,70 +47,151 @@ public void setUp() throws Exception {
}

@Test
public void test() throws Exception {
DeadLetterQueueWriter queueWriter = new DeadLetterQueueWriter(dir, 100000000, 10000000);
DLQEntry entry = new DLQEntry(new Event(), "test", "test", "test");
for (int i = 0; i < 10000; i++) {
queueWriter.writeEntry(entry);
public void testConsumeTwiceNoOffsetsWithDate() throws Exception {
DeadLetterQueueWriter queueWriter = null;
try {
queueWriter = new DeadLetterQueueWriter(dir, 100000000, 10000000);
Timestamp cutoffTimestamp = writeEventsWithCutoff(queueWriter, 1000, 800);

try(DeadLetterQueueInputPlugin plugin = new DeadLetterQueueInputPlugin(dir, false, null, cutoffTimestamp)) {
assertMessagesReceived(plugin, 200);
}
writeEvents(queueWriter, 5);
try(DeadLetterQueueInputPlugin secondPlugin = new DeadLetterQueueInputPlugin(dir, false, null, cutoffTimestamp)) {
assertMessagesReceived(secondPlugin, 205);
}
} finally {
queueWriter.close();
}
}

Path since = temporaryFolder.newFile(".sincdb").toPath();
DeadLetterQueueInputPlugin plugin = new DeadLetterQueueInputPlugin(dir, true, since, null);
@Test
public void testConsumeTwiceOffsetsNoDate() throws Exception {
DeadLetterQueueWriter queueWriter = null;
try {
queueWriter = new DeadLetterQueueWriter(dir, 100000000, 10000000);
Path since = getSinceDbPathName();
writeEventsWithCutoff(queueWriter, 1000, 800);

final AtomicInteger count = new AtomicInteger();
Thread pluginThread = new Thread(() -> {
try {
plugin.register();
plugin.run((e) -> {count.incrementAndGet();});
} catch (Exception e) {
// do nothing
try(DeadLetterQueueInputPlugin plugin = new DeadLetterQueueInputPlugin(dir, true, since, null)) {
assertMessagesReceived(plugin, 1000);
}
});
pluginThread.start();
Thread.sleep(15000);
assertEquals(10000, count.get());
queueWriter.writeEntry(entry);
Thread.sleep(200);
assertEquals(10001, count.get());
pluginThread.interrupt();
pluginThread.join();
plugin.close();
writeEvents(queueWriter, 5);
try(DeadLetterQueueInputPlugin secondPlugin = new DeadLetterQueueInputPlugin(dir, true, since, null)) {
assertMessagesReceived(secondPlugin, 5);
}
}finally{
queueWriter.close();
}
}

queueWriter.writeEntry(entry);
queueWriter.writeEntry(entry);
@Test
public void testConsumeTwiceOffsetsWithDate() throws Exception {
DeadLetterQueueWriter queueWriter = null;
try {
queueWriter = new DeadLetterQueueWriter(dir, 100000000, 10000000);
Path since = getSinceDbPathName();
Timestamp cutoffTimestamp = writeEventsWithCutoff(queueWriter, 1000, 800);

DeadLetterQueueInputPlugin secondPlugin = new DeadLetterQueueInputPlugin(dir, true, since, null);
try(DeadLetterQueueInputPlugin plugin = new DeadLetterQueueInputPlugin(dir, true, since, cutoffTimestamp)){
assertMessagesReceived(plugin, 200);
}

pluginThread = new Thread(() -> {
writeEvents(queueWriter, 5);
try(DeadLetterQueueInputPlugin secondPlugin = new DeadLetterQueueInputPlugin(dir, true, since, cutoffTimestamp)){
assertMessagesReceived(secondPlugin, 5);
}
}finally{
queueWriter.close();
}
}

@Test
public void testConsumeTwiceNoOffsetsNoDate() throws Exception {
DeadLetterQueueWriter queueWriter = null;
try {
queueWriter = new DeadLetterQueueWriter(dir, 100000000, 10000000);
writeEventsWithCutoff(queueWriter, 1000, 800);

try(DeadLetterQueueInputPlugin plugin = new DeadLetterQueueInputPlugin(dir, false, null, null)){
assertMessagesReceived(plugin, 1000);
}

writeEvents(queueWriter, 5);

try(DeadLetterQueueInputPlugin secondPlugin = new DeadLetterQueueInputPlugin(dir, false, null, null)) {
assertMessagesReceived(secondPlugin, 1005);
}
}finally{
queueWriter.close();
}
}

/**
* Assert that the number of messages received by the plugin matches the expected count.
* @param plugin
* @param expectedCount
* @throws InterruptedException
* @throws IOException
*/
private static void assertMessagesReceived(DeadLetterQueueInputPlugin plugin, int expectedCount) throws InterruptedException, IOException {
LongAdder count = new LongAdder();
Thread pluginThread = new Thread(() -> {
try {
secondPlugin.register();
secondPlugin.run((e) -> {count.incrementAndGet();});
plugin.register();
plugin.run((e) -> {count.increment();});
} catch (Exception e) {
// do nothing
}
});
pluginThread.start();
Thread.sleep(200);
Thread.sleep(2000);
pluginThread.interrupt();
pluginThread.join();
secondPlugin.close();
assertEquals(10003, count.get());
pluginThread.join(1000);
assertEquals(expectedCount, count.intValue());
}

@Test
public void testTimestamp() throws Exception {
DeadLetterQueueWriter queueWriter = new DeadLetterQueueWriter(dir, 100000, 10000000);
/**
* Write events to the queue, adding a boundary
* @param queueWriter instance of {@link DeadLetterQueueWriter} to write entry to queue
* @param eventsToWrite How many events to write in total
* @param cutOffPoint After how many events should the 'cutoff' timestamp be written
* @return CutOff {@link Timestamp}
* @throws IOException
*/
private static Timestamp writeEventsWithCutoff(DeadLetterQueueWriter queueWriter, int eventsToWrite, int cutOffPoint) throws IOException {
long epoch = 1490659200000L;
String targetDateString = "";
for (int i = 0; i < 10000; i++) {
Timestamp cutoffTimestamp = null;
for (int i = 0; i < eventsToWrite; i++) {
DLQEntry entry = new DLQEntry(new Event(), "test", "test", "test", new Timestamp(epoch));
queueWriter.writeEntry(entry);
epoch += 1000;
if (i == 800) {
targetDateString = entry.getEntryTime().toIso8601();
if (i == cutOffPoint) {
cutoffTimestamp = entry.getEntryTime();
}
}
DeadLetterQueueInputPlugin plugin = new DeadLetterQueueInputPlugin(dir, false, null, new Timestamp(targetDateString));
plugin.register();
return cutoffTimestamp;
}

/**
* Write events to the queue
* @param queueWriter instance of {@link DeadLetterQueueWriter} to write entry to queue
* @param eventsToWrite How many events to write in total
* @throws IOException
*/
private static void writeEvents(DeadLetterQueueWriter queueWriter, int eventsToWrite) throws IOException {
for (int i = 0; i < eventsToWrite; i++) {
DLQEntry entry = new DLQEntry(new Event(), "test", "test", "test");
queueWriter.writeEntry(entry);
}
}

/**
* Return the path of the since db, but do not create
* @return {@link Path} Location of the since db.
*/
private Path getSinceDbPathName() {
return temporaryFolder.getRoot().toPath().resolve(".sincdb");
}

}