sadanand48 commented on code in PR #4249:
URL: https://github.com/apache/ozone/pull/4249#discussion_r1098760350
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java:
##########
@@ -302,14 +303,19 @@ protected OmMetadataManagerImpl() {
}
// metadata constructor for snapshots
- private OmMetadataManagerImpl(OzoneConfiguration conf, String
snapshotDirName)
- throws IOException {
+ private OmMetadataManagerImpl(OzoneConfiguration conf, String
snapshotDirName,
+ boolean isSnapshotInCache) throws IOException {
lock = new OmReadOnlyLock();
omEpoch = 0;
String snapshotDir = OMStorage.getOmDbDir(conf) +
OM_KEY_PREFIX + OM_SNAPSHOT_DIR;
- setStore(loadDB(conf, new File(snapshotDir),
- OM_DB_NAME + snapshotDirName, true));
+ File metaDir = new File(snapshotDir);
+ String dbName = OM_DB_NAME + snapshotDirName;
+ if (isSnapshotInCache) {
+ File checkpoint = Paths.get(metaDir.toPath().toString(),
dbName).toFile();
+ RDBCheckpointManager.waitForCheckpointDirectoryExist(checkpoint);
Review Comment:
Yup this is only to avoid reads failing right after a createSnapshot
Request, Since we don't have a cache like feature in snapshot to prevent
subsequent reads till entry is actually flushed to DB, I think all we can do is
wait till entry gets flushed and if entry is in cache, it is most likely it
will get flushed .
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java:
##########
@@ -2209,4 +2209,46 @@ private void createLinkBucket(String linkVolume, String
linkBucket,
OzoneVolume ozoneVolume = objectStore.getVolume(linkVolume);
ozoneVolume.createBucket(linkBucket, builder.build());
}
+
+ @Test
+ public void testSnapshotRead() throws Exception {
+ // Init data
+ OzoneBucket bucket1 =
+ TestDataUtil.createVolumeAndBucket(cluster, bucketLayout);
+ Path volume1Path = new Path(OZONE_URI_DELIMITER, bucket1.getVolumeName());
+ Path bucket1Path = new Path(volume1Path, bucket1.getName());
+ Path file1 = new Path(bucket1Path, "key1");
+ Path file2 = new Path(bucket1Path, "key2");
+
+ ContractTestUtils.touch(fs, file1);
+ ContractTestUtils.touch(fs, file2);
+
+ OzoneBucket bucket2 =
+ TestDataUtil.createVolumeAndBucket(cluster, bucketLayout);
+ Path volume2Path = new Path(OZONE_URI_DELIMITER, bucket2.getVolumeName());
+ Path bucket2Path = new Path(volume2Path, bucket2.getName());
+
+ fs.mkdirs(bucket2Path);
+ Path snapPath1 = fs.createSnapshot(bucket1Path, "snap1");
+ Path snapPath2 = fs.createSnapshot(bucket2Path, "snap1");
+
+ Path file3 = new Path(bucket1Path, "key3");
+ ContractTestUtils.touch(fs, file3);
+
+ Path snapPath3 = fs.createSnapshot(bucket1Path, "snap2");
+
+ try {
+ FileStatus[] f1 = fs.listStatus(snapPath1);
+ FileStatus[] f2 = fs.listStatus(snapPath2);
+ FileStatus[] f3 = fs.listStatus(snapPath3);
+ Assert.assertEquals(2, f1.length);
+ Assert.assertEquals(0, f2.length);
+ Assert.assertEquals(3, f3.length);
+ } catch (Exception e) {
+ Assert.fail("Failed to read/list on snapshotPath, exception: " + e);
+ }
+
+ }
+
Review Comment:
Done.
--
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]
