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..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 @@ -269,10 +269,12 @@ 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}" + } else { + val rendered = userResourceConsumption.asScala.iterator.collect { + case (userIdentifier, resourceConsumption) if !resourceConsumption.isEmpty => + s"\n UserIdentifier: ${userIdentifier}, ResourceConsumption: ${resourceConsumption}" }.mkString("") + if (rendered.isEmpty) "empty" else rendered } 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)) {