From 9e64b0df23fb89c05064cd71ba188c4c39e14323 Mon Sep 17 00:00:00 2001 From: gaoyajun02 Date: Mon, 29 Jun 2026 18:52:52 +0800 Subject: [PATCH 1/2] [MINOR] Filter empty ResourceConsumption entries in WorkerInfo toString output Co-Authored-By: Claude Opus 4.8 (1M context) --- .../apache/celeborn/common/meta/WorkerInfo.scala | 13 +++++++++---- .../celeborn/common/quota/ResourceConsumption.scala | 5 +++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala b/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala index 0304bd4236a..f8e59dc1f1b 100644 --- a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala +++ b/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala @@ -269,10 +269,15 @@ class WorkerInfo( val userResourceConsumptionString = if (userResourceConsumption == null || userResourceConsumption.isEmpty) { "empty" - } else if (userResourceConsumption != null) { - userResourceConsumption.asScala.map { case (userIdentifier, resourceConsumption) => - s"\n UserIdentifier: ${userIdentifier}, ResourceConsumption: ${resourceConsumption}" - }.mkString("") + } else { + val nonEmpty = userResourceConsumption.asScala.filterNot(_._2.isEmpty) + if (nonEmpty.isEmpty) { + "empty" + } else { + nonEmpty.map { case (userIdentifier, resourceConsumption) => + s"\n UserIdentifier: ${userIdentifier}, ResourceConsumption: ${resourceConsumption}" + }.mkString("") + } } s""" |Host: $host diff --git a/common/src/main/scala/org/apache/celeborn/common/quota/ResourceConsumption.scala b/common/src/main/scala/org/apache/celeborn/common/quota/ResourceConsumption.scala index d454bb894c2..780d9eb1bed 100644 --- a/common/src/main/scala/org/apache/celeborn/common/quota/ResourceConsumption.scala +++ b/common/src/main/scala/org/apache/celeborn/common/quota/ResourceConsumption.scala @@ -76,6 +76,11 @@ case class ResourceConsumption( (add(other._1), addSubResourceConsumptions(other._2)) } + def isEmpty: Boolean = { + diskBytesWritten == 0 && diskFileCount == 0 && hdfsBytesWritten == 0 && hdfsFileCount == 0 && + CollectionUtils.isEmpty(subResourceConsumptions) + } + override def toString: String = { val subResourceConsumptionString = if (CollectionUtils.isEmpty(subResourceConsumptions)) { From a9a57b9ca03e656b41b13469985915d891210867 Mon Sep 17 00:00:00 2001 From: gaoyajun02 <81629032+gaoyajun02@users.noreply.github.com> Date: Tue, 7 Jul 2026 10:36:01 +0800 Subject: [PATCH 2/2] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../org/apache/celeborn/common/meta/WorkerInfo.scala | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala b/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala index f8e59dc1f1b..a8db00d7d8e 100644 --- a/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala +++ b/common/src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala @@ -270,14 +270,11 @@ class WorkerInfo( if (userResourceConsumption == null || userResourceConsumption.isEmpty) { "empty" } else { - val nonEmpty = userResourceConsumption.asScala.filterNot(_._2.isEmpty) - if (nonEmpty.isEmpty) { - "empty" - } else { - nonEmpty.map { case (userIdentifier, resourceConsumption) => + val rendered = userResourceConsumption.asScala.iterator.collect { + case (userIdentifier, resourceConsumption) if !resourceConsumption.isEmpty => s"\n UserIdentifier: ${userIdentifier}, ResourceConsumption: ${resourceConsumption}" - }.mkString("") - } + }.mkString("") + if (rendered.isEmpty) "empty" else rendered } s""" |Host: $host