Fix a stream parsing edge case (elastic/elasticsearch#413)

BytesReference doesn't like size 0 slices

Original commit: elastic/x-pack-elasticsearch@20ef0d2c1f
This commit is contained in:
David Roberts 2016-11-29 13:52:34 +00:00 committed by GitHub
parent 5d2cc13797
commit c99ee42f0e
3 changed files with 16 additions and 7 deletions

View File

@ -159,6 +159,9 @@ public class CppLogMessageHandler implements Closeable {
}
from = nextMarker + 1;
}
if (from >= bytesRef.length()) {
return null;
}
return bytesRef.slice(from, bytesRef.length() - from);
}

View File

@ -64,6 +64,9 @@ public class StateProcessor extends AbstractComponent {
persister.persistBulkState(jobId, bytesRef.slice(from, nextZeroByte - from));
from = nextZeroByte + 1;
}
if (from >= bytesRef.length()) {
return null;
}
return bytesRef.slice(from, bytesRef.length() - from);
}

View File

@ -35,14 +35,17 @@ public class CppLogMessageHandlerTests extends ESTestCase {
+ "{\"logger\":\"controller\",\"timestamp\":1478261169065,\"level\":\"DEBUG\",\"pid\":10211,\"thread\":\"0x7fff7d2a8000\","
+ "\"message\":\"Prelert controller exiting\",\"method\":\"main\",\"file\":\"Main.cc\",\"line\":147}\n";
InputStream is = new ByteArrayInputStream(testData.getBytes(StandardCharsets.UTF_8));
try (CppLogMessageHandler handler = new CppLogMessageHandler(is, "_id", 100, 3)) {
handler.tailStream();
// Try different buffer sizes to smoke out edge case problems in the buffer management
for (int readBufSize : new int[] { 11, 42, 101, 1024, 9999 }) {
InputStream is = new ByteArrayInputStream(testData.getBytes(StandardCharsets.UTF_8));
try (CppLogMessageHandler handler = new CppLogMessageHandler(is, "_id", readBufSize, 3)) {
handler.tailStream();
assertTrue(handler.hasLogStreamEnded());
assertEquals(10211L, handler.getPid(Duration.ofMillis(1)));
assertEquals("Did not understand verb 'a'\n", handler.getErrors());
assertFalse(handler.seenFatalError());
assertTrue(handler.hasLogStreamEnded());
assertEquals(10211L, handler.getPid(Duration.ofMillis(1)));
assertEquals("Did not understand verb 'a'\n", handler.getErrors());
assertFalse(handler.seenFatalError());
}
}
}
}