Skip to content

Commit 847be38

Browse files
authored
HDDS-11491. Avoid sharing clientId among deleting services (apache#7250)
(cherry picked from commit c91f1c7)
1 parent cba4cbc commit 847be38

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
@@ -72,7 +72,7 @@ public abstract class AbstractKeyDeletingService extends BackgroundService
7272

7373
private final OzoneManager ozoneManager;
7474
private final ScmBlockLocationProtocol scmClient;
75-
private static ClientId clientId = ClientId.randomId();
75+
private final ClientId clientId = ClientId.randomId();
7676
private final AtomicLong deletedDirsCount;
7777
private final AtomicLong movedDirsCount;
7878
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
@@ -38,7 +38,6 @@
3838
import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
3939
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PurgePathRequest;
4040
import org.apache.hadoop.util.Time;
41-
import org.apache.ratis.protocol.ClientId;
4241
import org.slf4j.Logger;
4342
import org.slf4j.LoggerFactory;
4443

@@ -75,8 +74,6 @@ public class DirectoryDeletingService extends AbstractKeyDeletingService {
7574
public static final Logger LOG =
7675
LoggerFactory.getLogger(DirectoryDeletingService.class);
7776

78-
private static ClientId clientId = ClientId.randomId();
79-
8077
// Use only a single thread for DirDeletion. Multiple threads would read
8178
// or write to same tables and can send deletion requests for same key
8279
// multiple times.

0 commit comments

Comments
 (0)