(incubator-celeborn) branch main updated: [CELEBORN-1174][FOLLOWUP] Master computeResourceConsumption miss applicationId

[ni...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new fe5d968f4 [CELEBORN-1174][FOLLOWUP] Master computeResourceConsumption miss applicationId
fe5d968f4 is described below

commit fe5d968f433436c6fd9c30a31392e051cc1c0d5b
Author: Angerszhuuuu <an...@gmail.com>
AuthorDate: Wed Feb 28 11:57:41 2024 +0800

    [CELEBORN-1174][FOLLOWUP] Master computeResourceConsumption miss applicationId
    
    ### What changes were proposed in this pull request?
     Master computeResourceConsumption miss applicationId
    
    ### Why are the changes needed?
     Master computeResourceConsumption miss applicationId
    
    ### Does this PR introduce _any_ user-facing change?
    
    ### How was this patch tested?
    
    Closes #2341 from AngersZhuuuu/CELEBORN-1174-FOLLOW.
    
    Authored-by: Angerszhuuuu <an...@gmail.com>
    Signed-off-by: SteNicholas <pr...@163.com>
---
 .../scala/org/apache/celeborn/service/deploy/master/Master.scala  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala b/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala
index a43582e72..a8cb4e72d 100644
--- a/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala
+++ b/master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala
@@ -986,22 +986,22 @@ private[celeborn] class Master(
     resourceConsumptionSource.addGauge(
       ResourceConsumptionSource.DISK_FILE_COUNT,
       resourceConsumptionLabel) { () =>
-      computeResourceConsumption(userIdentifier).diskFileCount
+      computeResourceConsumption(userIdentifier, applicationId).diskFileCount
     }
     resourceConsumptionSource.addGauge(
       ResourceConsumptionSource.DISK_BYTES_WRITTEN,
       resourceConsumptionLabel) { () =>
-      computeResourceConsumption(userIdentifier).diskBytesWritten
+      computeResourceConsumption(userIdentifier, applicationId).diskBytesWritten
     }
     resourceConsumptionSource.addGauge(
       ResourceConsumptionSource.HDFS_FILE_COUNT,
       resourceConsumptionLabel) { () =>
-      computeResourceConsumption(userIdentifier).hdfsFileCount
+      computeResourceConsumption(userIdentifier, applicationId).hdfsFileCount
     }
     resourceConsumptionSource.addGauge(
       ResourceConsumptionSource.HDFS_BYTES_WRITTEN,
       resourceConsumptionLabel) { () =>
-      computeResourceConsumption(userIdentifier).hdfsBytesWritten
+      computeResourceConsumption(userIdentifier, applicationId).hdfsBytesWritten
     }
   }