This is an automated email from the ASF dual-hosted git repository.
hemant 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 6af67c720a HDDS-9333. Snapshot should use snapshot's keyManager in
optimizeDirDeletesAndSubmitRequest (#5337)
6af67c720a is described below
commit 6af67c720a8511949d5c99b1dedde7c665294891
Author: Aswin Shakil Balasubramanian <[email protected]>
AuthorDate: Mon Sep 25 11:11:48 2023 -0700
HDDS-9333. Snapshot should use snapshot's keyManager in
optimizeDirDeletesAndSubmitRequest (#5337)
---
.../apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java | 4 ++--
.../org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java | 3 ++-
.../org/apache/hadoop/ozone/om/service/SnapshotDeletingService.java | 3 ++-
3 files changed, 6 insertions(+), 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 a966b9a60e..76579668d5 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
@@ -394,7 +394,7 @@ public abstract class AbstractKeyDeletingService extends
BackgroundService
List<Pair<String, OmKeyInfo>> allSubDirList,
List<PurgePathRequest> purgePathRequestList,
String snapTableKey, long startTime,
- int remainingBufLimit) {
+ int remainingBufLimit, KeyManager keyManager) {
// Optimization to handle delete sub-dir and keys to remove quickly
// This case will be useful to handle when depth of directory is high
@@ -408,7 +408,7 @@ public abstract class AbstractKeyDeletingService extends
BackgroundService
PurgePathRequest request = prepareDeleteDirRequest(
remainNum, stringOmKeyInfoPair.getValue(),
stringOmKeyInfoPair.getKey(), allSubDirList,
- getOzoneManager().getKeyManager());
+ keyManager);
if (isBufferLimitCrossed(remainingBufLimit, consumedSize,
request.getSerializedSize())) {
// ignore further add request
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 ed6c3914da..71f352588d 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
@@ -212,7 +212,8 @@ public class DirectoryDeletingService extends
AbstractKeyDeletingService {
optimizeDirDeletesAndSubmitRequest(
remainNum, dirNum, subDirNum, subFileNum,
allSubDirList, purgePathRequestList, null, startTime,
- ratisByteLimit - consumedSize);
+ ratisByteLimit - consumedSize,
+ getOzoneManager().getKeyManager());
} catch (IOException e) {
LOG.error("Error while running delete directories and files " +
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDeletingService.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDeletingService.java
index d4b545068c..5aa2fc78a0 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDeletingService.java
@@ -444,7 +444,8 @@ public class SnapshotDeletingService extends
AbstractKeyDeletingService {
remainNum = optimizeDirDeletesAndSubmitRequest(remainNum, dirNum,
subDirNum, subFileNum, allSubDirList, purgePathRequestList,
- snapInfo.getTableKey(), startTime, ratisByteLimit - consumedSize);
+ snapInfo.getTableKey(), startTime, ratisByteLimit - consumedSize,
+ omSnapshot.getKeyManager());
} catch (IOException e) {
LOG.error("Error while running delete directories and files for " +
"snapshot " + snapInfo.getTableKey() + " in snapshot deleting " +
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
