Skip to content

Tuning pool concurrency #3432

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

Closed
horizonzy wants to merge 11 commits into from
Closed

Tuning pool concurrency #3432

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c7dba88
tuning allocator pooling concurrency.
horizonzy Jul 28, 2022
5e94453
fix code style.
horizonzy Jul 28, 2022
ea0c5d8
fix code style.
horizonzy Jul 28, 2022
45098f6
Use DbLedgerStorageConfiguration to config DbLedgerStorage
horizonzy Jul 29, 2022
3218e8c
compatible with old version.
horizonzy Jul 29, 2022
fc09e80
add apache license.
horizonzy Jul 29, 2022
75d4abc
override getAllocatorPoolingConcurrency
horizonzy Jul 29, 2022
0c7c726
Merge branch 'master' into tuning-pool-concurrency
horizonzy Jul 29, 2022
b0e2e7f
fix checkstyle
horizonzy Jul 29, 2022
ba5fa38
fix checkstyle
horizonzy Jul 29, 2022
5c33be7
fix checkstyle
horizonzy Jul 29, 2022
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
4 changes: 2 additions & 2 deletions ...keeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ public class DbLedgerStorage implements LedgerStorage {

private static final int MB = 1024 * 1024;

private static final long DEFAULT_WRITE_CACHE_MAX_SIZE_MB =
public static final long DEFAULT_WRITE_CACHE_MAX_SIZE_MB =
(long) (0.25 * PlatformDependent.estimateMaxDirectMemory()) / MB;
private static final long DEFAULT_READ_CACHE_MAX_SIZE_MB =
public static final long DEFAULT_READ_CACHE_MAX_SIZE_MB =
(long) (0.25 * PlatformDependent.estimateMaxDirectMemory()) / MB;

static final String READ_AHEAD_CACHE_BATCH_SIZE = "dbStorage_readAheadCacheBatchSize";
Expand Down
46 changes: 46 additions & 0 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
// CHECKSTYLE.OFF: IllegalImport
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.util.NettyRuntime;
import io.netty.util.internal.PlatformDependent;
// CHECKSTYLE.ON: IllegalImport
import java.io.File;
Expand Down Expand Up @@ -3858,6 +3860,50 @@ public boolean isLocalConsistencyCheckOnStartup() {
return this.getBoolean(LOCAL_CONSISTENCY_CHECK_ON_STARTUP, false);
}

/**
* The configured pooling concurrency for the allocator, if user config it, we should consider the unpooled
* direct memory which readCache and writeCache occupy when use DbLedgerStorage.
*/
public int getAllocatorPoolingConcurrency() {
Integer allocatorPoolingConcurrency = this.getInteger(ALLOCATOR_POOLING_CONCURRENCY, null);
if (allocatorPoolingConcurrency != null) {
return allocatorPoolingConcurrency;
}
String ledgerStorageClass = getLedgerStorageClass();
if (DbLedgerStorage.class.getName().equals(ledgerStorageClass)) {
long writeCacheMb;
Object writeCacheConf = this.getProperty(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB);
if (writeCacheConf instanceof Number) {
writeCacheMb = ((Number) writeCacheConf).longValue();
} else if (writeCacheConf == null) {
writeCacheMb = DbLedgerStorage.DEFAULT_WRITE_CACHE_MAX_SIZE_MB;
} else if (StringUtils.isEmpty(this.getString(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB))) {
writeCacheMb = DbLedgerStorage.DEFAULT_WRITE_CACHE_MAX_SIZE_MB;
} else {
writeCacheMb = this.getLong(DbLedgerStorage.WRITE_CACHE_MAX_SIZE_MB);
}
Copy link
Contributor

@dlg99 dlg99 Jul 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think all this can be done better by moving

        long writeCacheMaxSize = getLongVariableOrDefault(conf, WRITE_CACHE_MAX_SIZE_MB,
                DEFAULT_WRITE_CACHE_MAX_SIZE_MB) * MB;
        long readCacheMaxSize = getLongVariableOrDefault(conf, READ_AHEAD_CACHE_MAX_SIZE_MB,
                DEFAULT_READ_CACHE_MAX_SIZE_MB) * MB;
        boolean directIOEntryLogger = getBooleanVariableOrDefault(conf, DIRECT_IO_ENTRYLOGGER, false);

and related config magic out of DbLedgerStorage into the ServerConfig
and then all you'd need to do is something like this.getWriteCacheMaxSize()

Copy link
Member Author

@horizonzy horizonzy Jul 29, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea.

Copy link
Member

@StevenLuMT StevenLuMT Jul 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good suggestion, I green with @dlg99

  1. move DbLedgerStorage.DEFAULT_WRITE_CACHE_MAX_SIZE_MB to ServerConfiguration.DEFAULT_WRITE_CACHE_MAX_SIZE_MB

  2. use new code

long writeCacheMaxSize = getLongVariableOrDefault(conf, WRITE_CACHE_MAX_SIZE_MB, conf.getAllocatorPoolingConcurrency()) * MB; 
long readCacheMaxSize = getLongVariableOrDefault(conf, READ_AHEAD_CACHE_MAX_SIZE_MB, conf.getAllocatorPoolingConcurrency()) * MB;

instead of

long writeCacheMaxSize = getLongVariableOrDefault(conf, WRITE_CACHE_MAX_SIZE_MB, DEFAULT_WRITE_CACHE_MAX_SIZE_MB) * MB; 
long readCacheMaxSize = getLongVariableOrDefault(conf, READ_AHEAD_CACHE_MAX_SIZE_MB, DEFAULT_READ_CACHE_MAX_SIZE_MB) * MB;

long readCacheMb;
Object readCacheConf = this.getProperty(DbLedgerStorage.READ_AHEAD_CACHE_MAX_SIZE_MB);
if (readCacheConf instanceof Number) {
readCacheMb = ((Number) readCacheConf).longValue();
} else if (readCacheConf == null) {
readCacheMb = DbLedgerStorage.DEFAULT_READ_CACHE_MAX_SIZE_MB;
} else if (StringUtils.isEmpty(this.getString(DbLedgerStorage.READ_AHEAD_CACHE_MAX_SIZE_MB))) {
readCacheMb = DbLedgerStorage.DEFAULT_READ_CACHE_MAX_SIZE_MB;
} else {
readCacheMb = this.getLong(DbLedgerStorage.READ_AHEAD_CACHE_MAX_SIZE_MB);
}
int mb = 1024 * 1024;
long availableDirectMemory = PlatformDependent.maxDirectMemory() - writeCacheMb * mb - readCacheMb * mb;
int defaultMinNumArena = NettyRuntime.availableProcessors() * 2;
final int defaultChunkSize =
PooledByteBufAllocator.defaultPageSize() << PooledByteBufAllocator.defaultMaxOrder();
int suitableNum = (int) (availableDirectMemory / defaultChunkSize / 2 / 3);
return Math.min(defaultMinNumArena, suitableNum);
}
return super.getAllocatorPoolingConcurrency();
}

/**
* Get the authorized roles.
*
Expand Down