aswinshakil commented on code in PR #4651:
URL: https://github.com/apache/ozone/pull/4651#discussion_r1187718380
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java:
##########
@@ -403,73 +406,147 @@ public static DBCheckpoint createOmSnapshotCheckpoint(
}
/**
- * Helper method to delete keys in the snapshot scope from active DB's
- * deletedTable.
- *
+ * Helper method to delete DB keys in the snapshot scope (bucket)
+ * from active DB's deletedDirectoryTable.
* @param omMetadataManager OMMetadataManager instance
* @param volumeName volume name
* @param bucketName bucket name
*/
- private static void deleteKeysInSnapshotScopeFromDTableInternal(
+ private static void deleteKeysFromDelDirTableInSnapshotScope(
OMMetadataManager omMetadataManager,
String volumeName,
String bucketName) throws IOException {
// Range delete start key (inclusive)
- String beginKey =
- omMetadataManager.getOzoneKey(volumeName, bucketName, "");
-
- // Range delete end key (exclusive) to be found
+ final String beginKey = getOzonePathKeyWithVolumeBucketNames(
+ omMetadataManager, volumeName, bucketName);
+ // Range delete end key (exclusive). To be calculated
String endKey;
- // Start performance tracking timer
- long startTime = System.nanoTime();
+ try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
+ iter = omMetadataManager.getDeletedDirTable().iterator()) {
+ endKey = findEndKeyGivenPrefix(iter, beginKey);
+ }
- try (TableIterator<String,
- ? extends Table.KeyValue<String, RepeatedOmKeyInfo>>
- keyIter = omMetadataManager.getDeletedTable().iterator()) {
-
- keyIter.seek(beginKey);
- // Continue only when there are entries of snapshot (bucket) scope
- // in deletedTable in the first place
- if (!keyIter.hasNext()) {
- // Use null as a marker. No need to do deleteRange() at all.
- endKey = null;
- } else {
- // Remember the last key with a matching prefix
- endKey = keyIter.next().getKey();
-
- // Loop until prefix mismatches.
- // TODO: [SNAPSHOT] Try to seek next predicted bucket name (speed up?)
- while (keyIter.hasNext()) {
- Table.KeyValue<String, RepeatedOmKeyInfo> entry = keyIter.next();
- String dbKey = entry.getKey();
- if (dbKey.startsWith(beginKey)) {
- endKey = dbKey;
- }
+ // Clean up deletedDirectoryTable
+ deleteRangeInclusive(omMetadataManager.getDeletedDirTable(),
+ beginKey, endKey);
+ }
+
+ /**
+ * Helper method to generate /volumeId/bucketId/ DB key prefix from given
+ * volume name and bucket name as a prefix in FSO deletedDirectoryTable.
+ * Follows:
+ * {@link OmMetadataManagerImpl#getOzonePathKey(long, long, long, String)}.
+ * @param volumeName volume name
+ * @param bucketName bucket name
+ * @return /volumeId/bucketId/
+ * e.g. /-9223372036854772480/-9223372036854771968/
+ */
+ public static String getOzonePathKeyWithVolumeBucketNames(
Review Comment:
Then I guess it should be fine if we aren't using it anywhere else.
--
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]
