This is an automated email from the ASF dual-hosted git repository.

roryqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git


The following commit(s) were added to refs/heads/master by this push:
     new ad9fddded [#1189][FOLLOWUP] fix(server): Start 
NettyDirectMemoryTracker. (#1432)
ad9fddded is described below

commit ad9fdddedc81473b2ec0a11f7f2ca6c3356f2bd9
Author: RickyMa <[email protected]>
AuthorDate: Mon Jan 15 10:07:17 2024 +0800

    [#1189][FOLLOWUP] fix(server): Start NettyDirectMemoryTracker. (#1432)
    
    ### What changes were proposed in this pull request?
    
    Fix PR [#1363](https://github.com/apache/incubator-uniffle/pull/1363).
    NettyDirectMemoryTracker will not be started currently.
    
    ### Why are the changes needed?
    
    It's a followup PR for 
[#1363](https://github.com/apache/incubator-uniffle/pull/1363).
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Existing UTs.
---
 .../main/java/org/apache/uniffle/server/NettyDirectMemoryTracker.java   | 2 +-
 server/src/main/java/org/apache/uniffle/server/ShuffleServer.java       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/server/src/main/java/org/apache/uniffle/server/NettyDirectMemoryTracker.java 
b/server/src/main/java/org/apache/uniffle/server/NettyDirectMemoryTracker.java
index 7506aed17..208e41595 100644
--- 
a/server/src/main/java/org/apache/uniffle/server/NettyDirectMemoryTracker.java
+++ 
b/server/src/main/java/org/apache/uniffle/server/NettyDirectMemoryTracker.java
@@ -21,7 +21,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import io.grpc.netty.shaded.io.netty.util.internal.PlatformDependent;
+import io.netty.util.internal.PlatformDependent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java 
b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
index eac948470..9b296c98f 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
@@ -142,6 +142,7 @@ public class ShuffleServer {
     initMetricsReporter();
 
     registerHeartBeat.startHeartBeat();
+    directMemoryUsageReporter.start();
     Runtime.getRuntime()
         .addShutdownHook(
             new Thread() {

Reply via email to