swamirishi commented on code in PR #9270:
URL: https://github.com/apache/ozone/pull/9270#discussion_r2508389425
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java:
##########
@@ -421,11 +429,13 @@ private Optional<PurgePathRequest>
prepareDeleteDirRequest(
// step-3: If both sub-dirs and sub-files are exhausted under a parent
// directory, only then delete the parent.
- String purgeDeletedDir = purgeDir && subDirDeleteResult.isProcessedKeys()
&&
- subFileDeleteResult.isProcessedKeys() ? delDirName : null;
+ String purgeDeletedDir = purgeDir && remainNum.get() > 0 ? delDirName :
null;
Review Comment:
Let us keep the flag and not change the logic unncessarily
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java:
##########
@@ -460,9 +470,32 @@ private OzoneManagerProtocolProtos.PurgePathRequest
wrapPurgeRequest(
return purgePathsRequest.build();
}
- private OzoneManagerProtocolProtos.OMResponse
submitPurgePaths(List<PurgePathRequest> requests,
+ private void submitPurgePaths(List<PurgePathRequest> requests,
String snapTableKey, UUID expectedPreviousSnapshotId,
Map<VolumeBucketId, BucketNameInfo> bucketNameInfoMap)
throws InterruptedException {
+
+ int consumedSize = 0;
+ List<PurgePathRequest> purgePathRequestList = new ArrayList<>();
+ for (PurgePathRequest purgePathRequest : requests) {
+ consumedSize += purgePathRequest.getSerializedSize();
+ if (consumedSize <= ratisByteLimit) {
+ purgePathRequestList.add(purgePathRequest);
+ } else {
+ submitPurgeRequest(snapTableKey, expectedPreviousSnapshotId,
bucketNameInfoMap, purgePathRequestList);
+ purgePathRequestList.clear();
+ purgePathRequestList.add(purgePathRequest);
+ consumedSize = 0;
+ }
Review Comment:
```suggestion
purgePathRequestList.add(purgePathRequest);
consumedSize += purgePathRequest.getSerializedSize();
if (consumedSize >= ratisByteLimit) {
OzoneManagerProtocolProtos.OMResponse response =
submitPurgeRequest(snapTableKey, expectedPreviousSnapshotId, bucketNameInfoMap,
purgePathRequestList);
if (!response.getSuccess()) {
return;
}
purgePathRequestList.clear();
consumedSize = 0;
}
```
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java:
##########
@@ -460,9 +470,32 @@ private OzoneManagerProtocolProtos.PurgePathRequest
wrapPurgeRequest(
return purgePathsRequest.build();
}
- private OzoneManagerProtocolProtos.OMResponse
submitPurgePaths(List<PurgePathRequest> requests,
+ private void submitPurgePaths(List<PurgePathRequest> requests,
String snapTableKey, UUID expectedPreviousSnapshotId,
Map<VolumeBucketId, BucketNameInfo> bucketNameInfoMap)
throws InterruptedException {
+
+ int consumedSize = 0;
+ List<PurgePathRequest> purgePathRequestList = new ArrayList<>();
Review Comment:
Call this purgePathRequestBatch
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/DeleteKeysResult.java:
##########
@@ -27,26 +27,13 @@
public class DeleteKeysResult {
private List<OmKeyInfo> keysToDelete;
- private long consumedSize;
- private boolean processedKeys;
-
- public DeleteKeysResult(List<OmKeyInfo> keysToDelete,
- long consumedSize, boolean processedKeys) {
+ public DeleteKeysResult(List<OmKeyInfo> keysToDelete) {
this.keysToDelete = keysToDelete;
- this.consumedSize = consumedSize;
- this.processedKeys = processedKeys;
}
public List<OmKeyInfo> getKeysToDelete() {
return keysToDelete;
}
- public long getConsumedSize() {
- return consumedSize;
- }
-
- public boolean isProcessedKeys() {
Review Comment:
Why remove this? We should still have this flag
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java:
##########
@@ -460,9 +470,32 @@ private OzoneManagerProtocolProtos.PurgePathRequest
wrapPurgeRequest(
return purgePathsRequest.build();
}
- private OzoneManagerProtocolProtos.OMResponse
submitPurgePaths(List<PurgePathRequest> requests,
+ private void submitPurgePaths(List<PurgePathRequest> requests,
Review Comment:
return List<OmResponse> here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
