(incubator-celeborn) branch branch-0.4 updated: [CELEBORN-1219] takeBuffer() avoid checking source.metricsCollectCriticalEnabled twice

[ethanfeng]

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

ethanfeng pushed a commit to branch branch-0.4
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git


The following commit(s) were added to refs/heads/branch-0.4 by this push:
     new 60f026036 [CELEBORN-1219] takeBuffer() avoid checking 
source.metricsCollectCriticalEnabled twice
60f026036 is described below

commit 60f026036390e1eb5413912d5e431d79785e7a18
Author: Angerszhuuuu <angers....@gmail.com>
AuthorDate: Mon Jan 15 16:50:40 2024 +0800

    [CELEBORN-1219] takeBuffer() avoid checking 
source.metricsCollectCriticalEnabled twice
    
    ### What changes were proposed in this pull request?
    takeBuffer() avoid checking source.metricsCollectCriticalEnabled twice
    
    ### Why are the changes needed?
    
    ### Does this PR introduce _any_ user-facing change?
    
    ### How was this patch tested?
    
    Closes #2223 from AngersZhuuuu/CELEBORN-1219.
    
    Authored-by: Angerszhuuuu <angers....@gmail.com>
    Signed-off-by: mingji <fengmingxiao....@alibaba-inc.com>
    (cherry picked from commit 1495fca69bf183a401911daaed92dce78f7d62d5)
    Signed-off-by: mingji <fengmingxiao....@alibaba-inc.com>
    
    # Conflicts:
    #       
worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/FileWriter.java
---
 .../service/deploy/worker/storage/FileWriter.java  | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git 
a/worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/FileWriter.java
 
b/worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/FileWriter.java
index 3cba81cba..aed7f3bef 100644
--- 
a/worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/FileWriter.java
+++ 
b/worker/src/main/java/org/apache/celeborn/service/deploy/worker/storage/FileWriter.java
@@ -364,23 +364,18 @@ public abstract class FileWriter implements 
DeviceObserver {
   }
 
   protected void takeBuffer() {
-    // metrics start
-    String metricsName = null;
-    String fileAbsPath = null;
     if (source.metricsCollectCriticalEnabled()) {
-      metricsName = WorkerSource.TAKE_BUFFER_TIME();
-      fileAbsPath = fileInfo.getFilePath();
+      String metricsName = WorkerSource.TAKE_BUFFER_TIME();
+      String fileAbsPath = fileInfo.getFilePath();
       source.startTimer(metricsName, fileAbsPath);
-    }
-
-    // real action
-    synchronized (flushLock) {
-      flushBuffer = flusher.takeBuffer();
-    }
-
-    // metrics end
-    if (source.metricsCollectCriticalEnabled()) {
+      synchronized (flushLock) {
+        flushBuffer = flusher.takeBuffer();
+      }
       source.stopTimer(metricsName, fileAbsPath);
+    } else {
+      synchronized (flushLock) {
+        flushBuffer = flusher.takeBuffer();
+      }
     }
   }