This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new c91f1c7f8d HDDS-11491. Avoid sharing clientId among deleting services
(#7250)
c91f1c7f8d is described below
commit c91f1c7f8dbec29f660421c880593ae798d2d81b
Author: Sumit Agrawal <[email protected]>
AuthorDate: Tue Oct 1 11:21:12 2024 +0530
HDDS-11491. Avoid sharing clientId among deleting services (#7250)
---
.../org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java | 2 +-
.../org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
index 0d3a05c9e4..d5da77ca0a 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
@@ -72,7 +72,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/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
index e638ce45a4..b300051599 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.ozone.om.snapshot.ReferenceCounted;
import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
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;
@@ -75,8 +74,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.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
