ivankelly commented on a change in pull request #1225: Issue #570: getting rid
of unnecessary synchronization in InterleavedLedgerStorage
URL: https://github.com/apache/bookkeeper/pull/1225#discussion_r172144582
##########
File path:
bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
##########
@@ -391,4 +400,137 @@ public void testGetEntryLogsSet() throws Exception {
assertEquals(Sets.newHashSet(0L, 1L, 2L, 3L),
logger.getEntryLogsSet());
}
+
+ static class LedgerStorageWriteTask implements Callable<Boolean> {
+ long ledgerId;
+ int entryId;
+ LedgerStorage ledgerStorage;
+
+ LedgerStorageWriteTask(long ledgerId, int entryId, LedgerStorage
ledgerStorage) {
+ this.ledgerId = ledgerId;
+ this.entryId = entryId;
+ this.ledgerStorage = ledgerStorage;
+ }
+
+ @Override
+ public Boolean call() {
+ try {
+ ledgerStorage.addEntry(generateEntry(ledgerId, entryId));
+ } catch (IOException e) {
+ LOG.error("Got Exception for AddEntry call. LedgerId: " +
ledgerId + " entryId: " + entryId, e);
+ return false;
+ }
+ return true;
+ }
+ }
+
+ static class LedgerStorageReadTask implements Callable<Boolean> {
+ long ledgerId;
+ int entryId;
+ LedgerStorage ledgerStorage;
+
+ LedgerStorageReadTask(long ledgerId, int entryId, LedgerStorage
ledgerStorage) {
+ this.ledgerId = ledgerId;
+ this.entryId = entryId;
+ this.ledgerStorage = ledgerStorage;
+ }
+
+ @Override
+ public Boolean call() {
+ try {
+ String expectedValue = generateDataString(ledgerId, entryId);
+ ByteBuf byteBuf = ledgerStorage.getEntry(ledgerId, entryId);
+ long actualLedgerId = byteBuf.readLong();
+ long actualEntryId = byteBuf.readLong();
+ byte[] data = new byte[byteBuf.readableBytes()];
+ byteBuf.readBytes(data);
+ if (ledgerId != actualLedgerId) {
+ LOG.error("For ledgerId: {} entryId: {} readRequest,
actual ledgerId: {}", ledgerId, entryId,
+ actualLedgerId);
+ return false;
+ }
+ if (entryId != actualEntryId) {
+ LOG.error("For ledgerId: {} entryId: {} readRequest,
actual entryId: {}", ledgerId, entryId,
+ actualEntryId);
+ return false;
+ }
+ if (!expectedValue.equals(new String(data))) {
+ LOG.error("For ledgerId: {} entryId: {} readRequest,
actual Data: {}", ledgerId, entryId,
+ new String(data));
+ return false;
+ }
+ } catch (IOException e) {
+ LOG.error("Got Exception for GetEntry call. LedgerId: " +
ledgerId + " entryId: " + entryId, e);
+ return false;
+ }
+ return true;
+ }
+ }
+
+ /**
+ * test concurrent write operations and then concurrent read
+ * operations using InterleavedLedgerStorage.
+ */
+ @Test
+ public void testConcurrentWriteAndReadCallsOfInterleavedLedgerStorage()
throws Exception {
Review comment:
> I don't understand why you need a sorted ledger storage test here. the
change is in entry log itself.
This change is in interleavedledgerstorage, which sortedledgerstorage
derives from. It removes synchronization from processEntry, which
sortedledgerstorage calls directly. It seems there's no other synchronization
in sortedledgerstorage though, so it should be ok.
> the test should focus on testing what it is changing,
which is _exactly_ why we shouldn't be constructing a full bookie to test it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
