[incubator-celeborn] branch CELEBORN-302 updated: update.

[ethanfeng]

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

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


The following commit(s) were added to refs/heads/CELEBORN-302 by this push:
     new deedf2d0 update.
deedf2d0 is described below

commit deedf2d0dc720a3176eb3eff9dfa59192184b632
Author: Ethan Feng <ethanf...@apache.org>
AuthorDate: Mon Feb 20 18:10:57 2023 +0800

    update.
---
 .../src/main/scala/org/apache/celeborn/common/meta/WorkerInfo.scala  | 5 ++---
 .../service/deploy/master/clustermeta/AbstractMetaManager.java       | 4 +++-
 2 files changed, 5 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 45e8453c..fbe3e1ce 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
@@ -268,13 +268,12 @@ class WorkerInfo(
         rpcPort == that.rpcPort &&
         pushPort == that.pushPort &&
         fetchPort == that.fetchPort &&
-        replicatePort == that.replicatePort &&
-        userResourceConsumption == that.userResourceConsumption
+        replicatePort == that.replicatePort
     case _ => false
   }
 
   override def hashCode(): Int = {
-    val state = Seq(host, rpcPort, pushPort, fetchPort, replicatePort, 
userResourceConsumption)
+    val state = Seq(host, rpcPort, pushPort, fetchPort, replicatePort)
     state.map(_.hashCode()).foldLeft(0)((a, b) => 31 * a + b)
   }
 }
diff --git 
a/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/AbstractMetaManager.java
 
b/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/AbstractMetaManager.java
index 75694a2a..7bbddbe2 100644
--- 
a/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/AbstractMetaManager.java
+++ 
b/master/src/main/java/org/apache/celeborn/service/deploy/master/clustermeta/AbstractMetaManager.java
@@ -235,7 +235,9 @@ public abstract class AbstractMetaManager implements 
IMetadataHandler {
 
     workerInfo.updateDiskMaxSlots(estimatedPartitionSize);
     synchronized (workers) {
-      workers.add(workerInfo);
+      if (!workers.contains(workerInfo)) {
+        workers.add(workerInfo);
+      }
     }
   }