From f75e9a8747d2f432cea5a4f568cc0e4e35f4be81 Mon Sep 17 00:00:00 2001 From: chenhang Date: Sun, 27 Mar 2022 15:58:14 +0800 Subject: [PATCH] revert rocksdb compaction on checkpoint to reduce cpu intensive --- .../bookkeeper/bookie/storage/ldb/EntryLocationIndex.java | 7 ------- .../bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java | 7 ------- 2 files changed, 14 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java index 613ec244301..41e021ac8c1 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java @@ -201,7 +201,6 @@ public void removeOffsetFromDeletedLedgers() throws IOException { long deletedEntriesInBatch = 0; Batch batch = locationsDb.newBatch(); - final byte[] firstDeletedKey = new byte[keyToDelete.array.length]; try { for (long ledgerId : ledgersToDelete) { @@ -244,9 +243,6 @@ public void removeOffsetFromDeletedLedgers() throws IOException { } batch.remove(keyToDelete.array); ++deletedEntriesInBatch; - if (deletedEntries++ == 0) { - System.arraycopy(keyToDelete.array, 0, firstDeletedKey, 0, firstDeletedKey.length); - } } if (deletedEntriesInBatch > DELETE_ENTRIES_BATCH_SIZE) { @@ -259,9 +255,6 @@ public void removeOffsetFromDeletedLedgers() throws IOException { try { batch.flush(); batch.clear(); - if (deletedEntries != 0) { - locationsDb.compact(firstDeletedKey, keyToDelete.array); - } } finally { firstKeyWrapper.recycle(); lastKeyWrapper.recycle(); diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java index 72e337ce3a1..f359e0371c4 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/LedgerMetadataIndex.java @@ -321,16 +321,12 @@ public void flush() throws IOException { public void removeDeletedLedgers() throws IOException { LongWrapper key = LongWrapper.get(); - final byte[] startKey = new byte[key.array.length]; int deletedLedgers = 0; while (!pendingDeletedLedgers.isEmpty()) { long ledgerId = pendingDeletedLedgers.poll(); key.set(ledgerId); ledgersDb.delete(key.array); - if (deletedLedgers++ == 0) { - System.arraycopy(key.array, 0, startKey, 0, startKey.length); - } } if (log.isDebugEnabled()) { @@ -338,9 +334,6 @@ public void removeDeletedLedgers() throws IOException { } ledgersDb.sync(); - if (deletedLedgers != 0) { - ledgersDb.compact(startKey, key.array); - } key.recycle(); }