Skip to content

HDDS-11183. Keys from DeletedTable and DeletedDirTable of Active Object Store should be deleted on batch operation while creating a snapshot #6946

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 1 commit into from
Jul 18, 2024
Merged

HDDS-11183. Keys from DeletedTable and DeletedDirTable of Active Object Store should be deleted on batch operation while creating a snapshot #6946

Show file tree
Hide file tree
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
15 changes: 8 additions & 7 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.apache.hadoop.hdds.StringUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.server.ServerUtils;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.hdds.utils.db.CodecRegistry;
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.hdds.utils.db.RDBStore;
Expand Down Expand Up @@ -447,7 +448,7 @@ public void invalidateCacheEntry(UUID key) {
* @return instance of DBCheckpoint
*/
public static DBCheckpoint createOmSnapshotCheckpoint(
OMMetadataManager omMetadataManager, SnapshotInfo snapshotInfo)
OMMetadataManager omMetadataManager, SnapshotInfo snapshotInfo, BatchOperation batchOperation)
throws IOException {
RDBStore store = (RDBStore) omMetadataManager.getStore();

Expand All @@ -468,10 +469,10 @@ public static DBCheckpoint createOmSnapshotCheckpoint(
// Clean up active DB's deletedTable right after checkpoint is taken,
// There is no need to take any lock as of now, because transactions are flushed sequentially.
deleteKeysFromDelKeyTableInSnapshotScope(omMetadataManager,
snapshotInfo.getVolumeName(), snapshotInfo.getBucketName());
snapshotInfo.getVolumeName(), snapshotInfo.getBucketName(), batchOperation);
// Clean up deletedDirectoryTable as well
deleteKeysFromDelDirTableInSnapshotScope(omMetadataManager,
snapshotInfo.getVolumeName(), snapshotInfo.getBucketName());
snapshotInfo.getVolumeName(), snapshotInfo.getBucketName(), batchOperation);

if (dbCheckpoint != null && snapshotDirExist) {
LOG.info("Checkpoint : {} for snapshot {} already exists.",
Expand All @@ -494,7 +495,7 @@ public static DBCheckpoint createOmSnapshotCheckpoint(
*/
private static void deleteKeysFromDelDirTableInSnapshotScope(
OMMetadataManager omMetadataManager, String volumeName,
String bucketName) throws IOException {
String bucketName, BatchOperation batchOperation) throws IOException {

// Range delete start key (inclusive)
final String keyPrefix = getOzonePathKeyForFso(omMetadataManager,
Expand All @@ -507,7 +508,7 @@ private static void deleteKeysFromDelDirTableInSnapshotScope(
if (LOG.isDebugEnabled()) {
LOG.debug("Removing key {} from DeletedDirTable", entry.getKey());
}
omMetadataManager.getDeletedDirTable().delete(entry.getKey());
omMetadataManager.getDeletedDirTable().deleteWithBatch(batchOperation, entry.getKey());
return null;
});
}
Expand Down Expand Up @@ -580,7 +581,7 @@ private static void deleteRangeInclusive(
*/
private static void deleteKeysFromDelKeyTableInSnapshotScope(
OMMetadataManager omMetadataManager, String volumeName,
String bucketName) throws IOException {
String bucketName, BatchOperation batchOperation) throws IOException {

// Range delete start key (inclusive)
final String keyPrefix =
Expand All @@ -593,7 +594,7 @@ private static void deleteKeysFromDelKeyTableInSnapshotScope(
if (LOG.isDebugEnabled()) {
LOG.debug("Removing key {} from DeletedTable", entry.getKey());
}
omMetadataManager.getDeletedTable().delete(entry.getKey());
omMetadataManager.getDeletedTable().deleteWithBatch(batchOperation, entry.getKey());
return null;
});
}
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/hadoop/ozone/om/response/snapshot/OMSnapshotCreateResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void addToDBBatch(OMMetadataManager omMetadataManager,

// Create the snapshot checkpoint. Also cleans up some tables.
OmSnapshotManager.createOmSnapshotCheckpoint(omMetadataManager,
snapshotInfo);
snapshotInfo, batchOperation);

// TODO: [SNAPSHOT] Move to createOmSnapshotCheckpoint and add table lock
// Remove all entries from snapshotRenamedTable
Expand Down
17 changes: 13 additions & 4 deletions ...p-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.HddsWhiteboxTestUtils;
import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.RDBBatchOperation;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
Expand Down Expand Up @@ -176,9 +177,11 @@ public void testCloseOnEviction() throws IOException {

((OmMetadataManagerImpl) om.getMetadataManager()).getSnapshotChainManager().addSnapshot(first);
((OmMetadataManagerImpl) om.getMetadataManager()).getSnapshotChainManager().addSnapshot(second);
RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
// create the first snapshot checkpoint
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
first);
first, rdbBatchOperation);
om.getMetadataManager().getStore().commitBatchOperation(rdbBatchOperation);

// retrieve it and setup store mock
OmSnapshotManager omSnapshotManager = om.getOmSnapshotManager();
Expand All @@ -190,8 +193,10 @@ public void testCloseOnEviction() throws IOException {
firstSnapshot.getMetadataManager(), "store", firstSnapshotStore);

// create second snapshot checkpoint (which will be used for eviction)
rdbBatchOperation = new RDBBatchOperation();
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
second);
second, rdbBatchOperation);
om.getMetadataManager().getStore().commitBatchOperation(rdbBatchOperation);

// confirm store not yet closed
verify(firstSnapshotStore, times(0)).close();
Expand Down Expand Up @@ -634,15 +639,19 @@ public void testCreateSnapshotIdempotent() throws Exception {
when(snapshotInfoTable.get(first.getTableKey())).thenReturn(first);

// Create first checkpoint for the snapshot checkpoint
RDBBatchOperation rdbBatchOperation = new RDBBatchOperation();
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
first);
first, rdbBatchOperation);
om.getMetadataManager().getStore().commitBatchOperation(rdbBatchOperation);
assertThat(logCapturer.getOutput()).doesNotContain(
"for snapshot " + first.getName() + " already exists.");
logCapturer.clearOutput();

// Create checkpoint again for the same snapshot.
rdbBatchOperation = new RDBBatchOperation();
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
first);
first, rdbBatchOperation);
om.getMetadataManager().getStore().commitBatchOperation(rdbBatchOperation);

assertThat(logCapturer.getOutput()).contains(
"for snapshot " + first.getName() + " already exists.");
Expand Down