athanatos closed pull request #1744: ISSUE #1737: EntryMemTable.newEntry:
always make a copy
URL: https://github.com/apache/bookkeeper/pull/1744
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java
index 73283989bb..0a95fe9215 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java
@@ -366,13 +366,8 @@ private EntryKeyValue newEntry(long ledgerId, long
entryId, final ByteBuffer ent
int offset = 0;
int length = entry.remaining();
- if (entry.hasArray()) {
- buf = entry.array();
- offset = entry.arrayOffset();
- } else {
- buf = new byte[length];
- entry.get(buf);
- }
+ buf = new byte[length];
+ entry.get(buf);
return new EntryKeyValue(ledgerId, entryId, buf, offset, length);
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
index 2475084677..e9c551e3dc 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
@@ -1755,6 +1755,18 @@ public int getSkipListArenaMaxAllocSize() {
return getInt(SKIP_LIST_MAX_ALLOC_ENTRY, 128 * 1024);
}
+ /**
+ * Set the max size we should allocate from the skiplist arena. Allocations
+ * larger than this should be allocated directly by the VM to avoid
fragmentation.
+ *
+ * @param size max alloc size.
+ * @return server configuration object.
+ */
+ public ServerConfiguration setSkipListArenaMaxAllocSize(int size) {
+ setProperty(SKIP_LIST_MAX_ALLOC_ENTRY, size);
+ return this;
+ }
+
/**
* Should the data be fsynced on journal before acknowledgment.
*
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
index 1a0342b46e..080ebfebb3 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
@@ -640,6 +640,39 @@ public void testTruncatedInEntryJournal() throws Exception
{
}
}
+ /**
+ * Test journal replay with SortedLedgerStorage and a very small max
+ * arena size.
+ */
+ @Test
+ public void testSortedLedgerStorageReplayWithSmallMaxArenaSize() throws
Exception {
+ File journalDir = createTempDir("bookie", "journal");
+ Bookie.checkDirectoryStructure(Bookie.getCurrentDirectory(journalDir));
+
+ File ledgerDir = createTempDir("bookie", "ledger");
+ Bookie.checkDirectoryStructure(Bookie.getCurrentDirectory(ledgerDir));
+
+ JournalChannel jc = writeV2Journal(
+ Bookie.getCurrentDirectory(journalDir), 100);
+
+ jc.fc.force(false);
+
+ writeIndexFileForLedger(Bookie.getCurrentDirectory(ledgerDir),
+ 1, "testPasswd".getBytes());
+
+ ServerConfiguration conf =
TestBKConfiguration.newServerConfiguration();
+
conf.setLedgerStorageClass("org.apache.bookkeeper.bookie.SortedLedgerStorage");
+ conf.setSkipListArenaMaxAllocSize(0);
+ conf.setJournalDirName(journalDir.getPath())
+ .setLedgerDirNames(new String[] { ledgerDir.getPath() });
+
+ Bookie b = new Bookie(conf);
+ b.readJournal();
+ b.ledgerStorage.flush();
+ b.readEntry(1, 80);
+ b.readEntry(1, 99);
+ }
+
/**
* Test partial index (truncate master key) with pre-v3 journals.
*/
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
