HDDS-11491. Avoid sharing clientId among deleting services (apache#7250)

(cherry picked from commit c91f1c7)
xichen01 · Nov 13, 2024 · 981ff69 · 981ff69
1 parent ef5fe72
commit 981ff69
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/...-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java b/...-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
@@ -75,7 +75,7 @@ public abstract class AbstractKeyDeletingService extends BackgroundService
 
   private final OzoneManager ozoneManager;
   private final ScmBlockLocationProtocol scmClient;
-  private static ClientId clientId = ClientId.randomId();
+  private final ClientId clientId = ClientId.randomId();
   private final AtomicLong deletedDirsCount;
   private final AtomicLong movedDirsCount;
   private final AtomicLong movedFilesCount;

diff --git a/...ne-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java b/...ne-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
@@ -36,7 +36,6 @@
 import org.apache.hadoop.ozone.om.snapshot.ReferenceCounted;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PurgePathRequest;
 import org.apache.hadoop.util.Time;
-import org.apache.ratis.protocol.ClientId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,8 +69,6 @@ public class DirectoryDeletingService extends AbstractKeyDeletingService {
   public static final Logger LOG =
       LoggerFactory.getLogger(DirectoryDeletingService.class);
 
-  private static ClientId clientId = ClientId.randomId();
-
   // Use only a single thread for DirDeletion. Multiple threads would read
   // or write to same tables and can send deletion requests for same key
   // multiple times.