Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,26 @@ public class PnioController implements AutoCloseable {
}
}

public final int maxThreads;
final ForkJoinPool forkJoinPool;
private final int maxThreads;
public volatile boolean done;

public PnioController( int parallelism, double maxThreadsMultiplicator ) {
this( getForkJoinPoolParallelism( parallelism ), ( int ) ( getForkJoinPoolParallelism( parallelism ) * maxThreadsMultiplicator ) );
}

public PnioController( int parallelism, int maxThreads ) {
forkJoinPool = new ForkJoinPool( parallelism, new ForkJoinPool.ForkJoinWorkerThreadFactory() {
int forkJoinPoolParallelism = getForkJoinPoolParallelism( parallelism );

// ForkJoinPool#MAX_CAP = 0x7fff
forkJoinPool = new ForkJoinPool( forkJoinPoolParallelism, new ForkJoinPool.ForkJoinWorkerThreadFactory() {
@SneakyThrows
@Override
public ForkJoinWorkerThread newThread( ForkJoinPool pool ) {
return ( ForkJoinWorkerThread ) carrierThread.invokeWithArguments( pool );
}
}, ( t, e ) -> log.error( e.getMessage(), e ),
true, parallelism, parallelism, parallelism, null, 60_000L, TimeUnit.MILLISECONDS );
true, 0, 0x7fff, forkJoinPoolParallelism, null, 60_000L, TimeUnit.MILLISECONDS );
this.maxThreads = maxThreads;

Metrics.gauge( "pnio_controller", Tags.of( "type", "QueuedTask" ), this, _ -> forkJoinPool.getQueuedTaskCount() );
Expand All @@ -68,6 +75,16 @@ public ForkJoinWorkerThread newThread( ForkJoinPool pool ) {
Metrics.gauge( "pnio_controller", Tags.of( "type", "RequestQueue" ), this, _ -> threadCounter.get() );
}

private static int getForkJoinPoolParallelism( int parallelism ) {
int forkJoinPoolParallelism;
if( parallelism > 0 ) {
forkJoinPoolParallelism = parallelism;
} else {
forkJoinPoolParallelism = Runtime.getRuntime().availableProcessors() - parallelism;
}
return forkJoinPoolParallelism;
}

@Override
public void close() {
done = true;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</distributionManagement>

<properties>
<oap.project.version>25.4.6</oap.project.version>
<oap.project.version>25.4.7</oap.project.version>

<oap.deps.config.version>25.0.1</oap.deps.config.version>
<oap.deps.oap-teamcity.version>25.0.0</oap.deps.oap-teamcity.version>
Expand Down
Loading