Skip to content

Commit 981ff69

Browse files
sumitagrawlxichen01
authored andcommitted
HDDS-11491. Avoid sharing clientId among deleting services (apache#7250)
(cherry picked from commit c91f1c7)
1 parent ef5fe72 commit 981ff69

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public abstract class AbstractKeyDeletingService extends BackgroundService
7575

7676
private final OzoneManager ozoneManager;
7777
private final ScmBlockLocationProtocol scmClient;
78-
private static ClientId clientId = ClientId.randomId();
78+
private final ClientId clientId = ClientId.randomId();
7979
private final AtomicLong deletedDirsCount;
8080
private final AtomicLong movedDirsCount;
8181
private final AtomicLong movedFilesCount;

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.apache.hadoop.ozone.om.snapshot.ReferenceCounted;
3737
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PurgePathRequest;
3838
import org.apache.hadoop.util.Time;
39-
import org.apache.ratis.protocol.ClientId;
4039
import org.slf4j.Logger;
4140
import org.slf4j.LoggerFactory;
4241

@@ -70,8 +69,6 @@ public class DirectoryDeletingService extends AbstractKeyDeletingService {
7069
public static final Logger LOG =
7170
LoggerFactory.getLogger(DirectoryDeletingService.class);
7271

73-
private static ClientId clientId = ClientId.randomId();
74-
7572
// Use only a single thread for DirDeletion. Multiple threads would read
7673
// or write to same tables and can send deletion requests for same key
7774
// multiple times.

0 commit comments

Comments
 (0)