Skip to content

HDDS-9687. Handle key deletion with OM Ratis disabled #5600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 1 commit into from
Nov 20, 2023
Merged

HDDS-9687. Handle key deletion with OM Ratis disabled #5600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,15 @@ protected void submitPurgePaths(List<PurgePathRequest> requests,

// Submit Purge paths request to OM
try {
RaftClientRequest raftClientRequest =
createRaftClientRequestForPurge(omRequest);
ozoneManager.getOmRatisServer().submitRequest(omRequest,
raftClientRequest);
if (isRatisEnabled()) {
RaftClientRequest raftClientRequest =
createRaftClientRequestForPurge(omRequest);
ozoneManager.getOmRatisServer().submitRequest(omRequest,
raftClientRequest);
} else {
getOzoneManager().getOmServerProtocol()
.submitRequest(null, omRequest);
}
} catch (ServiceException e) {
LOG.error("PurgePaths request failed. Will retry at next run.");
}
Expand Down Expand Up @@ -434,8 +439,7 @@ public long optimizeDirDeletesAndSubmitRequest(long remainNum,
}
}

// TODO: need to handle delete with non-ratis
if (isRatisEnabled() && !purgePathRequestList.isEmpty()) {
if (!purgePathRequestList.isEmpty()) {
submitPurgePaths(purgePathRequestList, snapTableKey);
}

Expand Down