Skip to content

Use netty maxDirectMemory instead of DirectMemoryUtils #2989

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
nicoloboschi merged 1 commit into from
Apr 6, 2022
Merged

Use netty maxDirectMemory instead of DirectMemoryUtils #2989

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
6 changes: 4 additions & 2 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/IndexInMemPageMgr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
import static org.apache.bookkeeper.bookie.BookKeeperServerStats.NUM_INDEX_PAGES;

import com.google.common.base.Stopwatch;
//CHECKSTYLE.OFF: IllegalImport
import io.netty.util.internal.PlatformDependent;
//CHECKSTYLE.ON: IllegalImport
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -47,7 +50,6 @@
import org.apache.bookkeeper.stats.Gauge;
import org.apache.bookkeeper.stats.OpStatsLogger;
import org.apache.bookkeeper.stats.StatsLogger;
import org.apache.bookkeeper.util.DirectMemoryUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -350,7 +352,7 @@ public IndexInMemPageMgr(int pageSize,
this.indexPersistenceManager = indexPersistenceManager;
this.pageMapAndList = new InMemPageCollection(statsLogger);

long maxDirectMemory = DirectMemoryUtils.maxDirectMemory();
long maxDirectMemory = PlatformDependent.estimateMaxDirectMemory();

if (conf.getPageLimit() <= 0) {
// By default, allocate a third of the direct memory to the page cache
Expand Down
60 changes: 0 additions & 60 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/util/DirectMemoryUtils.java
View file
Open in desktop

This file was deleted.