From 4b0c8f0b054b589788f10db21adfcf481ddce90a Mon Sep 17 00:00:00 2001 From: xianjingfeng Date: Fri, 17 Nov 2023 15:11:08 +0800 Subject: [PATCH 1/2] [MINOR] test: flaky test GrpcServerTest.testGrpcExecutorPool --- .../main/java/org/apache/uniffle/common/rpc/GrpcServer.java | 5 +++++ .../java/org/apache/uniffle/common/rpc/GrpcServerTest.java | 1 + 2 files changed, 6 insertions(+) diff --git a/common/src/main/java/org/apache/uniffle/common/rpc/GrpcServer.java b/common/src/main/java/org/apache/uniffle/common/rpc/GrpcServer.java index 38ae7a88fd..d154075e96 100644 --- a/common/src/main/java/org/apache/uniffle/common/rpc/GrpcServer.java +++ b/common/src/main/java/org/apache/uniffle/common/rpc/GrpcServer.java @@ -179,6 +179,11 @@ protected void afterExecute(Runnable r, Throwable t) { GRPCMetrics.GRPC_SERVER_EXECUTOR_BLOCKING_QUEUE_SIZE_KEY, getQueue().size()); super.afterExecute(r, t); } + + protected void correctMetrics() { + grpcMetrics.setGauge( + GRPCMetrics.GRPC_SERVER_EXECUTOR_BLOCKING_QUEUE_SIZE_KEY, getQueue().size()); + } } @Override diff --git a/common/src/test/java/org/apache/uniffle/common/rpc/GrpcServerTest.java b/common/src/test/java/org/apache/uniffle/common/rpc/GrpcServerTest.java index 9b4a11e8bb..63dc27a57d 100644 --- a/common/src/test/java/org/apache/uniffle/common/rpc/GrpcServerTest.java +++ b/common/src/test/java/org/apache/uniffle/common/rpc/GrpcServerTest.java @@ -77,6 +77,7 @@ public void testGrpcExecutorPool() throws Exception { Thread.yield(); } Thread.sleep(120); + executor.correctMetrics(); double activeThreads = grpcMetrics.getGaugeMap().get(GRPC_SERVER_EXECUTOR_ACTIVE_THREADS_KEY).get(); assertEquals(2, activeThreads); From ff1e4cfc9dbc101e38cd59682d12667764c10fa4 Mon Sep 17 00:00:00 2001 From: xianjingfeng Date: Fri, 17 Nov 2023 15:50:07 +0800 Subject: [PATCH 2/2] nit --- .../main/java/org/apache/uniffle/common/rpc/GrpcServer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/apache/uniffle/common/rpc/GrpcServer.java b/common/src/main/java/org/apache/uniffle/common/rpc/GrpcServer.java index d154075e96..cd7f889524 100644 --- a/common/src/main/java/org/apache/uniffle/common/rpc/GrpcServer.java +++ b/common/src/main/java/org/apache/uniffle/common/rpc/GrpcServer.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.collect.Queues; import io.grpc.BindableService; @@ -180,7 +181,8 @@ protected void afterExecute(Runnable r, Throwable t) { super.afterExecute(r, t); } - protected void correctMetrics() { + @VisibleForTesting + void correctMetrics() { grpcMetrics.setGauge( GRPCMetrics.GRPC_SERVER_EXECUTOR_BLOCKING_QUEUE_SIZE_KEY, getQueue().size()); }