github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add additional unit test and more broad checking

Browse source 
Fixes #7871

Fixes #7891
This commit is contained in:
Rob Bavey 2017-08-02 17:34:14 -04:00
parent 0c1b764440
commit 563d5720bd
2 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/src/main/java/org/logstash/common/io/RecordIOReader.java
View file

@ -146,7 +146,7 @@ public final class RecordIOReader implements Closeable {
*/
int seekToStartOfEventInBlock() {
// Already consumed all the bytes in this block.
if (currentBlock.position() == currentBlockSizeReadFromChannel){
if (currentBlock.position() >= currentBlockSizeReadFromChannel){
return -1;
}
while (true) {

28
logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java
View file

@ -115,6 +115,34 @@ public class DeadLetterQueueReaderTest {
manager.close();
}
// This test checks that polling after a block has been mostly filled with an event is handled correctly.
@Test
public void testRereadFinalBlock() throws Exception {
Event event = new Event(Collections.emptyMap());
// Fill event with not quite enough characters to fill block. Fill event with valid RecordType characters - this
// was the cause of https://github.com/elastic/logstash/issues/7868
char[] field = new char[32500];
Arrays.fill(field, 's');
event.setField("message", new String(field));
long startTime = System.currentTimeMillis();
int messageSize = 0;
try(DeadLetterQueueWriter writeManager = new DeadLetterQueueWriter(dir, 10 * 1024 * 1024, 1_000_000_000)) {
for (int i = 0; i < 2; i++) {
DLQEntry entry = new DLQEntry(event, "", "", "", new Timestamp(startTime++));
messageSize += entry.serialize().length;
writeManager.writeEntry(entry);
}
}
try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
for (int i = 0; i < 3;i++) {
readManager.pollEntry(100);
}
}
}
@Test
public void testSeek() throws Exception {
Event event = new Event(Collections.emptyMap());