Skip to content

Fix semaphore leak when EntryMemTable#addEntry accepts the same entries #2832

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

Merged
merlimat merged 1 commit into from
Oct 16, 2021
Merged

Fix semaphore leak when EntryMemTable#addEntry accepts the same entries #2832

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
3 changes: 3 additions & 0 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryMemTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ public long addEntry(long ledgerId, long entryId, final ByteBuffer entry, final
try {
EntryKeyValue toAdd = cloneWithAllocator(ledgerId, entryId, entry);
size = internalAdd(toAdd);
if (size == 0) {
skipListSemaphore.release(len);
}
} finally {
this.lock.readLock().unlock();
}
Expand Down
20 changes: 20 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryMemTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,5 +451,25 @@ public void run() {
assertEquals("listOfEntries should be sorted", Long.valueOf(i + 1), listOfEntries.get(i));
}
}

@Test
public void testAddSameEntries() throws IOException {
final long ledgerId = 1;
final long entryId = 1;
final int size = 10;
final byte[] bytes = new byte[size];
final int initialPermits = memTable.skipListSemaphore.availablePermits();

for (int i = 0; i < 5; i++) {
memTable.addEntry(ledgerId, entryId, ByteBuffer.wrap(bytes), this);
assertEquals(memTable.kvmap.size(), 1);
assertEquals(memTable.skipListSemaphore.availablePermits(), initialPermits - size);
}

memTable.snapshot(Checkpoint.MAX);
memTable.flush(this);
assertEquals(memTable.kvmap.size(), 0);
assertEquals(memTable.skipListSemaphore.availablePermits(), initialPermits);
}
}