Skip to content

HDDS-12210. Use correct BootstrapStateHandler.Lock in SnapshotDeletingService #7991

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
hemantk-12 merged 3 commits into from
Mar 6, 2025
Merged

HDDS-12210. Use correct BootstrapStateHandler.Lock in SnapshotDeletingService #7991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce1734c
HDDS-12210. Implemented BootstrapStateHandler for SnapshotDeletingSer…
hemantk-12 Feb 28, 2025
9063a5d
Added a flush for snapshot's RocksDBs
hemantk-12 Mar 4, 2025
2695421
Revert "Added a flush for snapshot's RocksDBs"
hemantk-12 Mar 5, 2025
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
5 changes: 3 additions & 2 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDBCheckpointServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,8 +649,9 @@ static class Lock extends BootstrapStateHandler.Lock {
locks = Stream.of(
om.getKeyManager().getDeletingService(),
om.getKeyManager().getSnapshotSstFilteringService(),
om.getMetadataManager().getStore().getRocksDBCheckpointDiffer(),
om.getKeyManager().getSnapshotDeletingService()
om.getKeyManager().getSnapshotDeletingService(),
om.getKeyManager().getSnapshotDirectoryService(),
om.getMetadataManager().getStore().getRocksDBCheckpointDiffer()
)
.filter(Objects::nonNull)
.map(BootstrapStateHandler::getBootstrapStateLock)
Expand Down
19 changes: 13 additions & 6 deletions ...one-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDeletingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down Expand Up @@ -61,6 +62,7 @@
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotMoveKeyInfos;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotMoveTableKeysRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotPurgeRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type;
import org.apache.ratis.protocol.ClientId;
import org.slf4j.Logger;
Expand Down Expand Up @@ -238,7 +240,7 @@ public BackgroundTaskResult call() throws InterruptedException {
return BackgroundTaskResult.EmptyTaskResult.newResult();
}

private void submitSnapshotPurgeRequest(List<String> purgeSnapshotKeys) {
private void submitSnapshotPurgeRequest(List<String> purgeSnapshotKeys) throws InterruptedException {
if (!purgeSnapshotKeys.isEmpty()) {
SnapshotPurgeRequest snapshotPurgeRequest = SnapshotPurgeRequest
.newBuilder()
Expand All @@ -251,14 +253,16 @@ private void submitSnapshotPurgeRequest(List<String> purgeSnapshotKeys) {
.setClientId(clientId.toString())
.build();

submitRequest(omRequest);
try (BootstrapStateHandler.Lock lock = getBootstrapStateLock().lock()) {
submitRequest(omRequest);
}
}
}

private void submitSnapshotMoveDeletedKeys(SnapshotInfo snapInfo,
List<SnapshotMoveKeyInfos> deletedKeys,
List<HddsProtos.KeyValue> renamedList,
List<SnapshotMoveKeyInfos> dirsToMove) {
List<SnapshotMoveKeyInfos> dirsToMove) throws InterruptedException {

SnapshotMoveTableKeysRequest.Builder moveDeletedKeysBuilder = SnapshotMoveTableKeysRequest.newBuilder()
.setFromSnapshotID(toProtobuf(snapInfo.getSnapshotId()));
Expand Down Expand Up @@ -287,15 +291,18 @@ private void submitSnapshotMoveDeletedKeys(SnapshotInfo snapInfo,
.setSnapshotMoveTableKeysRequest(moveDeletedKeys)
.setClientId(clientId.toString())
.build();

try (BootstrapStateHandler.Lock lock = new BootstrapStateHandler.Lock()) {
try (BootstrapStateHandler.Lock lock = getBootstrapStateLock().lock()) {
submitRequest(omRequest);
}
}

private void submitRequest(OMRequest omRequest) {
try {
OzoneManagerRatisUtils.submitRequest(ozoneManager, omRequest, clientId, getRunCount().get());
Status status =
OzoneManagerRatisUtils.submitRequest(ozoneManager, omRequest, clientId, getRunCount().get()).getStatus();
if (!Objects.equals(status, Status.OK)) {
LOG.error("Request: {} failed with an status: {}. Will retry in the next run.", omRequest, status);
}
} catch (ServiceException e) {
LOG.error("Request: {} fired by SnapshotDeletingService failed. Will retry in the next run", omRequest, e);
}
Expand Down