You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ra...@apache.org on 2021/11/12 04:13:57 UTC
[ozone] branch master updated: HDDS-5970. Remove
OMKeyRequest#getBucketLayout overridden method in subclasses (#2830)
This is an automated email from the ASF dual-hosted git repository.
rakeshr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 4558e40 HDDS-5970. Remove OMKeyRequest#getBucketLayout overridden method in subclasses (#2830)
4558e40 is described below
commit 4558e40b24c3bd1d6d393762b2b3da5a775b10b4
Author: Rakesh Radhakrishnan <ra...@apache.org>
AuthorDate: Fri Nov 12 09:43:38 2021 +0530
HDDS-5970. Remove OMKeyRequest#getBucketLayout overridden method in subclasses (#2830)
---
.../ozone/TestDirectoryDeletingServiceWithFSO.java | 13 +++--
.../hadoop/fs/ozone/TestOzoneFileInterfaces.java | 3 +-
.../fs/ozone/TestOzoneFileInterfacesWithFSO.java | 25 +++------
.../hadoop/fs/ozone/TestOzoneFileSystem.java | 5 +-
.../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 7 +--
.../rpc/TestOzoneClientMultipartUploadWithFSO.java | 5 --
.../apache/hadoop/ozone/om/TestKeyManagerImpl.java | 16 +++---
.../hadoop/ozone/om/TestOMRatisSnapshots.java | 5 +-
.../hadoop/ozone/om/TestObjectStoreWithFSO.java | 7 +--
.../ozone/recon/TestReconWithOzoneManagerFSO.java | 6 +--
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 15 ++++--
.../om/ratis/utils/OzoneManagerRatisUtils.java | 13 ++---
.../om/request/file/OMDirectoryCreateRequest.java | 9 ++--
.../file/OMDirectoryCreateRequestWithFSO.java | 6 ++-
.../ozone/om/request/file/OMFileCreateRequest.java | 5 ++
.../request/file/OMFileCreateRequestWithFSO.java | 9 ++--
.../request/key/OMAllocateBlockRequestWithFSO.java | 5 --
.../om/request/key/OMKeyDeleteRequestWithFSO.java | 5 --
.../ozone/om/request/key/OMKeyRenameRequest.java | 5 ++
.../om/request/key/OMKeyRenameRequestWithFSO.java | 10 ++--
.../om/request/key/OMPathsPurgeRequestWithFSO.java | 10 ++--
.../S3InitiateMultipartUploadRequestWithFSO.java | 5 --
.../S3MultipartUploadAbortRequestWithFSO.java | 5 --
.../S3MultipartUploadCommitPartRequestWithFSO.java | 5 --
.../S3MultipartUploadCompleteRequestWithFSO.java | 5 --
.../hadoop/ozone/om/TestOmMetadataManager.java | 4 +-
.../ozone/om/request/TestOMRequestUtils.java | 22 ++++----
.../file/TestOMDirectoryCreateRequestWithFSO.java | 63 ++++++++++++++--------
.../file/TestOMFileCreateRequestWithFSO.java | 3 +-
.../om/request/key/TestOMAllocateBlockRequest.java | 4 +-
.../TestS3MultipartUploadCompleteRequest.java | 15 +++---
...estS3MultipartUploadCompleteRequestWithFSO.java | 14 ++---
32 files changed, 157 insertions(+), 172 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
index cc33598..753d005 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
-import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.After;
import org.junit.AfterClass;
@@ -93,8 +92,8 @@ public class TestDirectoryDeletingServiceWithFSO {
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
conf.setBoolean(OZONE_ACL_ENABLED, true);
if (isBucketFSOptimized) {
- TestOMRequestUtils.configureFSOptimizedPaths(conf,
- enabledFileSystemPaths, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
+ conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED.name());
} else {
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
enabledFileSystemPaths);
@@ -211,7 +210,7 @@ public class TestDirectoryDeletingServiceWithFSO {
cluster.getOzoneManager().getMetadataManager().getDeletedDirTable();
Table<String, OmKeyInfo> keyTable =
cluster.getOzoneManager().getMetadataManager()
- .getKeyTable(getBucketLayout());
+ .getKeyTable(getFSOBucketLayout());
Table<String, OmDirectoryInfo> dirTable =
cluster.getOzoneManager().getMetadataManager().getDirectoryTable();
@@ -258,7 +257,7 @@ public class TestDirectoryDeletingServiceWithFSO {
cluster.getOzoneManager().getMetadataManager().getDeletedDirTable();
Table<String, OmKeyInfo> keyTable =
cluster.getOzoneManager().getMetadataManager()
- .getKeyTable(getBucketLayout());
+ .getKeyTable(getFSOBucketLayout());
Table<String, OmDirectoryInfo> dirTable =
cluster.getOzoneManager().getMetadataManager().getDirectoryTable();
@@ -332,7 +331,7 @@ public class TestDirectoryDeletingServiceWithFSO {
cluster.getOzoneManager().getMetadataManager().getDeletedDirTable();
Table<String, OmKeyInfo> keyTable =
cluster.getOzoneManager().getMetadataManager()
- .getKeyTable(getBucketLayout());
+ .getKeyTable(getFSOBucketLayout());
Table<String, OmDirectoryInfo> dirTable =
cluster.getOzoneManager().getMetadataManager().getDirectoryTable();
Table<String, RepeatedOmKeyInfo> deletedKeyTable =
@@ -404,7 +403,7 @@ public class TestDirectoryDeletingServiceWithFSO {
Assert.assertEquals(prevDeletedKeyCount + 5, currentDeletedKeyCount);
}
- public BucketLayout getBucketLayout() {
+ private static BucketLayout getFSOBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
}
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java
index 2ebad91..ac80678 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java
@@ -169,7 +169,8 @@ public class TestOzoneFileInterfaces {
OzoneConfiguration conf = cluster.getConf();
// create a volume and a bucket to be used by OzoneFileSystem
- TestDataUtil.createVolumeAndBucket(cluster, volumeName, bucketName);
+ TestDataUtil.createVolumeAndBucket(cluster, volumeName, bucketName,
+ getBucketLayout());
rootPath = String
.format("%s://%s.%s/", OzoneConsts.OZONE_URI_SCHEME, bucketName,
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesWithFSO.java
index dcd4ffa..220bdad 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesWithFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesWithFSO.java
@@ -18,17 +18,13 @@
package org.apache.hadoop.fs.ozone;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
-import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
/**
* Test OzoneFileSystem Interfaces - prefix layout.
@@ -39,11 +35,6 @@ import java.util.Collection;
@RunWith(Parameterized.class)
public class TestOzoneFileInterfacesWithFSO extends TestOzoneFileInterfaces {
- @Parameterized.Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] {{false, true, true}});
- }
-
public TestOzoneFileInterfacesWithFSO(boolean setDefaultFs,
boolean useAbsolutePath, boolean enabledFileSystemPaths)
throws Exception {
@@ -51,15 +42,6 @@ public class TestOzoneFileInterfacesWithFSO extends TestOzoneFileInterfaces {
}
@Override
- protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration conf = new OzoneConfiguration();
- TestOMRequestUtils.configureFSOptimizedPaths(conf,
- enableFileSystemPathsInstance,
- OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
- return conf;
- }
-
- @Override
@Test
@Ignore("HDDS-2939")
public void testReplication() throws IOException {
@@ -93,4 +75,9 @@ public class TestOzoneFileInterfacesWithFSO extends TestOzoneFileInterfaces {
public void testOzFsReadWrite() {
}
+
+ @Override
+ public BucketLayout getBucketLayout() {
+ return BucketLayout.FILE_SYSTEM_OPTIMIZED;
+ }
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
index 403918b..ce1de16 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystem.java
@@ -58,7 +58,6 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OpenKeySession;
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
-import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.ozone.test.GenericTestUtils;
@@ -159,8 +158,8 @@ public class TestOzoneFileSystem {
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
conf.setBoolean(OZONE_ACL_ENABLED, true);
if (bucketLayout.equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)) {
- TestOMRequestUtils.configureFSOptimizedPaths(conf, enabledFileSystemPaths,
- OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
+ conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
+ bucketLayout.name());
} else {
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
enabledFileSystemPaths);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
index cd6790f..5ea3c10 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
@@ -50,7 +50,6 @@ import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.TrashPolicyOzone;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLIdentityType;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType;
import org.apache.hadoop.ozone.security.acl.OzoneAclConfig;
@@ -170,13 +169,15 @@ public class TestRootedOzoneFileSystem {
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
if (isBucketFSOptimized) {
bucketLayout = BucketLayout.FILE_SYSTEM_OPTIMIZED;
- TestOMRequestUtils.configureFSOptimizedPaths(conf,
- true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
+ conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
+ bucketLayout.name());
} else {
bucketLayout = BucketLayout.LEGACY;
// We need the OFS buckets to be in LEGACY layout for this test.
conf.set(OzoneConfigKeys.OZONE_CLIENT_TEST_OFS_DEFAULT_BUCKET_LAYOUT,
BucketLayout.LEGACY.name());
+ conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
+ bucketLayout.name());
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
enabledFileSystemPaths);
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
index 1be4a79..c24ac6b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
@@ -1043,9 +1043,4 @@ public class TestOzoneClientMultipartUploadWithFSO {
Arrays.fill(chars, val);
return chars;
}
-
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
-
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
index 5a406ac..1af0b43 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
@@ -273,7 +273,7 @@ public class TestKeyManagerImpl {
.setDataSize(0)
.setReplicationConfig(keyArgs.getReplicationConfig())
.setFileEncryptionInfo(null).build();
- metadataManager.getOpenKeyTable(getBucketLayout()).put(
+ metadataManager.getOpenKeyTable(getDefaultBucketLayout()).put(
metadataManager.getOpenKey(VOLUME_NAME, BUCKET_NAME, KEY_NAME, 1L),
omKeyInfo);
LambdaTestUtils.intercept(OMException.class,
@@ -961,7 +961,7 @@ public class TestKeyManagerImpl {
for (int i = 1; i <= 100; i += 2) {
String key = metadataManager
.getOzoneKey(VOLUME_NAME, BUCKET_NAME, prefixKeyInCache + i);
- metadataManager.getKeyTable(getBucketLayout())
+ metadataManager.getKeyTable(getDefaultBucketLayout())
.addCacheEntry(new CacheKey<>(key),
new CacheValue<>(Optional.absent(), 2L));
}
@@ -1031,7 +1031,7 @@ public class TestKeyManagerImpl {
String key = metadataManager.getOzoneKey(
VOLUME_NAME, BUCKET_NAME,
keyNameDir1Subdir1 + OZONE_URI_DELIMITER + prefixKeyInCache + i);
- metadataManager.getKeyTable(getBucketLayout())
+ metadataManager.getKeyTable(getDefaultBucketLayout())
.addCacheEntry(new CacheKey<>(key),
new CacheValue<>(Optional.absent(), 2L));
}
@@ -1059,7 +1059,7 @@ public class TestKeyManagerImpl {
String key = metadataManager.getOzoneKey(
VOLUME_NAME, BUCKET_NAME, prefixKey + i);
// Mark as deleted in cache.
- metadataManager.getKeyTable(getBucketLayout())
+ metadataManager.getKeyTable(getDefaultBucketLayout())
.addCacheEntry(new CacheKey<>(key),
new CacheValue<>(Optional.absent(), 2L));
deletedKeySet.add(key);
@@ -1095,7 +1095,7 @@ public class TestKeyManagerImpl {
if (doDelete) {
String ozoneKey =
metadataManager.getOzoneKey(VOLUME_NAME, BUCKET_NAME, key);
- metadataManager.getKeyTable(getBucketLayout())
+ metadataManager.getKeyTable(getDefaultBucketLayout())
.addCacheEntry(new CacheKey<>(ozoneKey),
new CacheValue<>(Optional.absent(), 2L));
deletedKeySet.add(key);
@@ -1144,7 +1144,7 @@ public class TestKeyManagerImpl {
for (String key : existKeySet) {
String ozoneKey =
metadataManager.getOzoneKey(VOLUME_NAME, BUCKET_NAME, key);
- metadataManager.getKeyTable(getBucketLayout())
+ metadataManager.getKeyTable(getDefaultBucketLayout())
.addCacheEntry(new CacheKey<>(ozoneKey),
new CacheValue<>(Optional.absent(), 2L));
deletedKeySet.add(key);
@@ -1499,7 +1499,7 @@ public class TestKeyManagerImpl {
.build();
}
- public BucketLayout getBucketLayout() {
- return BucketLayout.LEGACY;
+ private static BucketLayout getDefaultBucketLayout() {
+ return BucketLayout.DEFAULT;
}
}
\ No newline at end of file
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
index 8993f91..cd3aee4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
@@ -193,7 +193,8 @@ public class TestOMRatisSnapshots {
Assert.assertNotNull(followerOMMetaMngr.getBucketTable().get(
followerOMMetaMngr.getBucketKey(volumeName, bucketName)));
for (String key : keys) {
- Assert.assertNotNull(followerOMMetaMngr.getKeyTable(getBucketLayout())
+ Assert.assertNotNull(followerOMMetaMngr.getKeyTable(
+ getDefaultBucketLayout())
.get(followerOMMetaMngr.getOzoneKey(volumeName, bucketName, key)));
}
}
@@ -318,7 +319,7 @@ public class TestOMRatisSnapshots {
return keys;
}
- public BucketLayout getBucketLayout() {
+ private static BucketLayout getDefaultBucketLayout() {
return BucketLayout.DEFAULT;
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
index 18558df..b8f37ce 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
@@ -100,13 +100,14 @@ public class TestObjectStoreWithFSO {
*
* @throws IOException
*/
- @BeforeClass public static void init() throws Exception {
+ @BeforeClass
+ public static void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
scmId = UUID.randomUUID().toString();
omId = UUID.randomUUID().toString();
- TestOMRequestUtils.configureFSOptimizedPaths(conf, true,
- OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
+ conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED.name());
cluster = MiniOzoneCluster.newBuilder(conf).setClusterId(clusterId)
.setScmId(scmId).setOmId(omId).build();
cluster.waitForClusterToBeReady();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
index 76f79e2..f3dc4b6 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerFSO.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.container.TestHelper;
import org.apache.hadoop.ozone.om.OMConfigKeys;
-import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.recon.api.NSSummaryEndpoint;
import org.apache.hadoop.ozone.recon.api.types.NamespaceSummaryResponse;
import org.apache.hadoop.ozone.recon.api.types.EntityType;
@@ -65,8 +65,8 @@ public class TestReconWithOzoneManagerFSO {
@BeforeClass
public static void init() throws Exception {
conf = new OzoneConfiguration();
- TestOMRequestUtils.configureFSOptimizedPaths(conf, true,
- OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
+ conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED.name());
cluster =
MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(1)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index c4f3d02..e0cabad 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -649,15 +649,20 @@ public class KeyManagerImpl implements KeyManager {
String volumeName = args.getVolumeName();
String bucketName = args.getBucketName();
String keyName = args.getKeyName();
- keyName = OMClientRequest
- .validateAndNormalizeKey(enableFileSystemPaths, keyName,
- getBucketLayout(metadataManager, args.getVolumeName(),
- args.getBucketName()));
+
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
bucketName);
+
+ BucketLayout bucketLayout =
+ getBucketLayout(metadataManager, args.getVolumeName(),
+ args.getBucketName());
+ keyName = OMClientRequest
+ .validateAndNormalizeKey(enableFileSystemPaths, keyName,
+ bucketLayout);
+
OmKeyInfo value = null;
try {
- if (isBucketFSOptimized(volumeName, bucketName)) {
+ if (bucketLayout.equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)) {
value = getOmKeyInfoFSO(volumeName, bucketName, keyName);
} else {
value = getOmKeyInfo(volumeName, bucketName, keyName);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
index 91d180f..b4d2e29 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
@@ -220,9 +220,9 @@ public final class OzoneManagerRatisUtils {
bucketLayout = getBucketLayout(keyArgs.getVolumeName(),
keyArgs.getBucketName(), ozoneManager);
if (bucketLayout.equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)) {
- return new OMKeyRenameRequestWithFSO(omRequest);
+ return new OMKeyRenameRequestWithFSO(omRequest, bucketLayout);
}
- return new OMKeyRenameRequest(omRequest);
+ return new OMKeyRenameRequest(omRequest, bucketLayout);
case RenameKeys:
return new OMKeysRenameRequest(omRequest);
case CreateDirectory:
@@ -230,21 +230,22 @@ public final class OzoneManagerRatisUtils {
bucketLayout = getBucketLayout(keyArgs.getVolumeName(),
keyArgs.getBucketName(), ozoneManager);
if (bucketLayout.equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)) {
- return new OMDirectoryCreateRequestWithFSO(omRequest);
+ return new OMDirectoryCreateRequestWithFSO(omRequest, bucketLayout);
}
- return new OMDirectoryCreateRequest(omRequest);
+ return new OMDirectoryCreateRequest(omRequest, bucketLayout);
case CreateFile:
keyArgs = omRequest.getCreateFileRequest().getKeyArgs();
bucketLayout = getBucketLayout(keyArgs.getVolumeName(),
keyArgs.getBucketName(), ozoneManager);
if (bucketLayout.equals(BucketLayout.FILE_SYSTEM_OPTIMIZED)) {
- return new OMFileCreateRequestWithFSO(omRequest);
+ return new OMFileCreateRequestWithFSO(omRequest, bucketLayout);
}
return new OMFileCreateRequest(omRequest);
case PurgeKeys:
return new OMKeyPurgeRequest(omRequest);
case PurgePaths:
- return new OMPathsPurgeRequestWithFSO(omRequest);
+ return new OMPathsPurgeRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
case InitiateMultiPartUpload:
keyArgs = omRequest.getInitiateMultiPartUploadRequest().getKeyArgs();
bucketLayout = getBucketLayout(keyArgs.getVolumeName(),
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
index 28a7d52..6e2cd7b 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
@@ -105,6 +105,11 @@ public class OMDirectoryCreateRequest extends OMKeyRequest {
super(omRequest);
}
+ public OMDirectoryCreateRequest(OMRequest omRequest,
+ BucketLayout bucketLayout) {
+ super(omRequest, bucketLayout);
+ }
+
@Override
public OMRequest preExecute(OzoneManager ozoneManager) {
CreateDirectoryRequest createDirectoryRequest =
@@ -366,8 +371,4 @@ public class OMDirectoryCreateRequest extends OMKeyRequest {
static long getMaxNumOfRecursiveDirs() {
return MAX_NUM_OF_RECURSIVE_DIRS;
}
-
- public BucketLayout getBucketLayout() {
- return BucketLayout.DEFAULT;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
index a9ad85a..ba41e6d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequestWithFSO.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.OMMetrics;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OzoneAclUtil;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
@@ -71,8 +72,9 @@ public class OMDirectoryCreateRequestWithFSO extends OMDirectoryCreateRequest {
private static final Logger LOG =
LoggerFactory.getLogger(OMDirectoryCreateRequestWithFSO.class);
- public OMDirectoryCreateRequestWithFSO(OMRequest omRequest) {
- super(omRequest);
+ public OMDirectoryCreateRequestWithFSO(OMRequest omRequest,
+ BucketLayout bucketLayout) {
+ super(omRequest, bucketLayout);
}
@Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
index 300c4eb..07e741d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequest.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.ozone.om.response.file.OMFileCreateResponse;
import org.slf4j.Logger;
@@ -79,6 +80,10 @@ public class OMFileCreateRequest extends OMKeyRequest {
super(omRequest);
}
+ public OMFileCreateRequest(OMRequest omRequest, BucketLayout bucketLayout) {
+ super(omRequest, bucketLayout);
+ }
+
@Override
public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
CreateFileRequest createFileRequest = getOmRequest().getCreateFileRequest();
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
index 736f4a1..988c87d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileCreateRequestWithFSO.java
@@ -60,13 +60,10 @@ public class OMFileCreateRequestWithFSO extends OMFileCreateRequest {
private static final Logger LOG =
LoggerFactory.getLogger(OMFileCreateRequestWithFSO.class);
- public OMFileCreateRequestWithFSO(OMRequest omRequest) {
- super(omRequest);
- }
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
+ public OMFileCreateRequestWithFSO(OMRequest omRequest,
+ BucketLayout bucketLayout) {
+ super(omRequest, bucketLayout);
}
@Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
index 70ca241..3f3a581 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMAllocateBlockRequestWithFSO.java
@@ -72,11 +72,6 @@ public class OMAllocateBlockRequestWithFSO extends OMAllocateBlockRequest {
}
@Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
-
- @Override
public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
long trxnLogIndex, OzoneManagerDoubleBufferHelper omDoubleBufferHelper) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
index 572afed..027f641 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyDeleteRequestWithFSO.java
@@ -204,9 +204,4 @@ public class OMKeyDeleteRequestWithFSO extends OMKeyDeleteRequest {
return omClientResponse;
}
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
index 6c0c5b4..5e25384 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequest.java
@@ -26,6 +26,7 @@ import com.google.common.base.Preconditions;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerDoubleBufferHelper;
import org.apache.hadoop.ozone.om.request.util.OmResponseUtil;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
@@ -71,6 +72,10 @@ public class OMKeyRenameRequest extends OMKeyRequest {
super(omRequest);
}
+ public OMKeyRenameRequest(OMRequest omRequest, BucketLayout bucketLayout) {
+ super(omRequest, bucketLayout);
+ }
+
@Override
public OMRequest preExecute(OzoneManager ozoneManager) throws IOException {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
index c67648e..b1ac59a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
@@ -66,8 +66,9 @@ public class OMKeyRenameRequestWithFSO extends OMKeyRenameRequest {
private static final Logger LOG =
LoggerFactory.getLogger(OMKeyRenameRequestWithFSO.class);
- public OMKeyRenameRequestWithFSO(OMRequest omRequest) {
- super(omRequest);
+ public OMKeyRenameRequestWithFSO(OMRequest omRequest,
+ BucketLayout bucketLayout) {
+ super(omRequest, bucketLayout);
}
@Override
@@ -300,9 +301,4 @@ public class OMKeyRenameRequestWithFSO extends OMKeyRenameRequest {
auditMap.put(OzoneConsts.DST_KEY, renameKeyRequest.getToKeyName());
return auditMap;
}
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
index e2d8a8c..df36e46 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMPathsPurgeRequestWithFSO.java
@@ -35,8 +35,9 @@ import java.util.List;
*/
public class OMPathsPurgeRequestWithFSO extends OMKeyRequest {
- public OMPathsPurgeRequestWithFSO(OMRequest omRequest) {
- super(omRequest);
+ public OMPathsPurgeRequestWithFSO(OMRequest omRequest,
+ BucketLayout bucketLayout) {
+ super(omRequest, bucketLayout);
}
@Override
@@ -62,9 +63,4 @@ public class OMPathsPurgeRequestWithFSO extends OMKeyRequest {
return omClientResponse;
}
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
index 09c188f..a6e2085 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3InitiateMultipartUploadRequestWithFSO.java
@@ -250,9 +250,4 @@ public class S3InitiateMultipartUploadRequestWithFSO
OMException.ResultCodes.NOT_A_FILE);
}
}
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
index 2e93c85..25fd681 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadAbortRequestWithFSO.java
@@ -88,9 +88,4 @@ public class S3MultipartUploadAbortRequestWithFSO
return multipartKey;
}
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
index 0541593..deec30d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCommitPartRequestWithFSO.java
@@ -85,9 +85,4 @@ public class S3MultipartUploadCommitPartRequestWithFSO
openKey, multipartKeyInfo, oldPartKeyInfo, omKeyInfo,
ozoneManager.isRatisEnabled(), omBucketInfo);
}
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
index 5031b9d..ed0bc63 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
@@ -167,10 +167,5 @@ public class S3MultipartUploadCompleteRequestWithFSO
return OMFileRequest
.getParentID(bucketId, pathComponents, keyName, omMetadataManager);
}
-
- @Override
- public BucketLayout getBucketLayout() {
- return BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
}
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
index 0a74dcf..dbe5497 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
@@ -482,7 +482,7 @@ public class TestOmMetadataManager {
String key = omMetadataManager.getOzoneKey(volumeNameA,
ozoneBucket, prefixKeyA + i);
// Mark as deleted in cache.
- omMetadataManager.getKeyTable(getBucketLayout()).addCacheEntry(
+ omMetadataManager.getKeyTable(getDefaultBucketLayout()).addCacheEntry(
new CacheKey<>(key),
new CacheValue<>(Optional.absent(), 100L));
deleteKeySet.add(key);
@@ -540,7 +540,7 @@ public class TestOmMetadataManager {
}
- public BucketLayout getBucketLayout() {
+ private static BucketLayout getDefaultBucketLayout() {
return BucketLayout.DEFAULT;
}
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java
index e9a9ad8..6326ea3 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMRequestUtils.java
@@ -228,21 +228,22 @@ public final class TestOMRequestUtils {
String ozoneKey = omMetadataManager.getOpenKey(volumeName, bucketName,
keyName, clientID);
if (addToCache) {
- omMetadataManager.getOpenKeyTable(getBucketLayout())
+ omMetadataManager.getOpenKeyTable(getDefaultBucketLayout())
.addCacheEntry(new CacheKey<>(ozoneKey),
new CacheValue<>(Optional.of(omKeyInfo), trxnLogIndex));
}
- omMetadataManager.getOpenKeyTable(getBucketLayout())
+ omMetadataManager.getOpenKeyTable(getDefaultBucketLayout())
.put(ozoneKey, omKeyInfo);
} else {
String ozoneKey = omMetadataManager.getOzoneKey(volumeName, bucketName,
keyName);
if (addToCache) {
- omMetadataManager.getKeyTable(getBucketLayout())
+ omMetadataManager.getKeyTable(getDefaultBucketLayout())
.addCacheEntry(new CacheKey<>(ozoneKey),
new CacheValue<>(Optional.of(omKeyInfo), trxnLogIndex));
}
- omMetadataManager.getKeyTable(getBucketLayout()).put(ozoneKey, omKeyInfo);
+ omMetadataManager.getKeyTable(getDefaultBucketLayout())
+ .put(ozoneKey, omKeyInfo);
}
}
@@ -266,7 +267,7 @@ public final class TestOMRequestUtils {
OmKeyInfo omKeyInfo = createOmKeyInfo(volumeName, bucketName, keyName,
replicationType, replicationFactor);
- omMetadataManager.getKeyTable(getBucketLayout()).addCacheEntry(
+ omMetadataManager.getKeyTable(getDefaultBucketLayout()).addCacheEntry(
new CacheKey<>(omMetadataManager.getOzoneKey(volumeName, bucketName,
keyName)), new CacheValue<>(Optional.of(omKeyInfo), 1L));
}
@@ -747,10 +748,10 @@ public final class TestOMRequestUtils {
throws IOException {
// Retrieve the keyInfo
OmKeyInfo omKeyInfo =
- omMetadataManager.getKeyTable(getBucketLayout()).get(ozoneKey);
+ omMetadataManager.getKeyTable(getDefaultBucketLayout()).get(ozoneKey);
// Delete key from KeyTable and put in DeletedKeyTable
- omMetadataManager.getKeyTable(getBucketLayout()).delete(ozoneKey);
+ omMetadataManager.getKeyTable(getDefaultBucketLayout()).delete(ozoneKey);
RepeatedOmKeyInfo repeatedOmKeyInfo =
omMetadataManager.getDeletedTable().get(ozoneKey);
@@ -896,8 +897,9 @@ public final class TestOMRequestUtils {
final String dbKey = omMetadataManager.getOzoneKey(
omKeyInfo.getVolumeName(), omKeyInfo.getBucketName(),
omKeyInfo.getKeyName());
- omMetadataManager.getKeyTable(getBucketLayout()).put(dbKey, omKeyInfo);
- omMetadataManager.getKeyTable(getBucketLayout()).addCacheEntry(
+ omMetadataManager.getKeyTable(getDefaultBucketLayout())
+ .put(dbKey, omKeyInfo);
+ omMetadataManager.getKeyTable(getDefaultBucketLayout()).addCacheEntry(
new CacheKey<>(dbKey),
new CacheValue<>(Optional.of(omKeyInfo), 1L));
}
@@ -1075,7 +1077,7 @@ public final class TestOMRequestUtils {
}
}
- public static BucketLayout getBucketLayout() {
+ private static BucketLayout getDefaultBucketLayout() {
return BucketLayout.DEFAULT;
}
}
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
index 1db63c1..ba8d835 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestWithFSO.java
@@ -121,7 +121,8 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
keyName);
OMDirectoryCreateRequestWithFSO omDirectoryCreateRequestWithFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmRequest =
omDirectoryCreateRequestWithFSO.preExecute(ozoneManager);
@@ -149,13 +150,15 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
keyName);
OMDirectoryCreateRequestWithFSO omDirCreateRequestFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq =
omDirCreateRequestFSO.preExecute(ozoneManager);
omDirCreateRequestFSO =
- new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMClientResponse omClientResponse =
omDirCreateRequestFSO.validateAndUpdateCache(ozoneManager, 100L,
@@ -176,13 +179,15 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
keyName);
OMDirectoryCreateRequestWithFSO omDirCreateRequestFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmRequest =
omDirCreateRequestFSO.preExecute(ozoneManager);
omDirCreateRequestFSO =
- new OMDirectoryCreateRequestWithFSO(modifiedOmRequest);
+ new OMDirectoryCreateRequestWithFSO(modifiedOmRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMClientResponse omClientResponse =
omDirCreateRequestFSO.validateAndUpdateCache(ozoneManager, 100L,
@@ -207,11 +212,13 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
keyName);
OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
- omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
TestOMRequestUtils.addVolumeToDB(volumeName, omMetadataManager);
OMClientResponse omClientResponse =
@@ -259,11 +266,13 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
keyName);
OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
- omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMClientResponse omClientResponse =
omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
@@ -312,11 +321,13 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
keyName);
OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
- omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMClientResponse omClientResponse =
omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
@@ -385,12 +396,14 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
keyName);
OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq =
omDirCreateReqFSO.preExecute(ozoneManager);
- omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMClientResponse omClientResponse =
omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
@@ -457,12 +470,14 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
keyName);
OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq =
omDirCreateReqFSO.preExecute(ozoneManager);
- omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMClientResponse omClientResponse =
omDirCreateReqFSO.validateAndUpdateCache(ozoneManager, 100L,
@@ -502,11 +517,13 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
OzoneFSUtils.addTrailingSlashIfNeeded(keyName));
OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
- omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
Assert.assertEquals(0L, omMetrics.getNumKeys());
OMClientResponse omClientResponse =
@@ -535,11 +552,13 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
OzoneFSUtils.addTrailingSlashIfNeeded(keyName));
OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
- omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
Assert.assertEquals(0L, omMetrics.getNumKeys());
OMClientResponse omClientResponse =
@@ -573,11 +592,13 @@ public class TestOMDirectoryCreateRequestWithFSO {
OMRequest omRequest = createDirectoryRequest(volumeName, bucketName,
OzoneFSUtils.addTrailingSlashIfNeeded(keyName));
OMDirectoryCreateRequestWithFSO omDirCreateReqFSO =
- new OMDirectoryCreateRequestWithFSO(omRequest);
+ new OMDirectoryCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
OMRequest modifiedOmReq = omDirCreateReqFSO.preExecute(ozoneManager);
- omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq);
+ omDirCreateReqFSO = new OMDirectoryCreateRequestWithFSO(modifiedOmReq,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
Assert.assertEquals(0L, omMetrics.getNumKeys());
OMClientResponse omClientResponse =
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
index bcbd749..534b936 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
@@ -194,7 +194,8 @@ public class TestOMFileCreateRequestWithFSO extends TestOMFileCreateRequest {
@Override
protected OMFileCreateRequest getOMFileCreateRequest(OMRequest omRequest) {
- return new OMFileCreateRequestWithFSO(omRequest);
+ return new OMFileCreateRequestWithFSO(omRequest,
+ BucketLayout.FILE_SYSTEM_OPTIMIZED);
}
@Override
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
index 3a67427..21209c4 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
@@ -57,7 +57,7 @@ public class TestOMAllocateBlockRequest extends TestOMKeyRequest {
public void testValidateAndUpdateCache() throws Exception {
// Add volume, bucket, key entries to DB.
TestOMRequestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
- omMetadataManager);
+ omMetadataManager, getBucketLayout());
addKeyToOpenKeyTable(volumeName, bucketName);
@@ -176,7 +176,7 @@ public class TestOMAllocateBlockRequest extends TestOMKeyRequest {
// Add volume, bucket entries to DB.
TestOMRequestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
- omMetadataManager);
+ omMetadataManager, omAllocateBlockRequest.getBucketLayout());
OMClientResponse omAllocateBlockResponse =
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
index 1875f4e..3993597 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.UUID;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -60,13 +59,7 @@ public class TestS3MultipartUploadCompleteRequest
String bucketName = UUID.randomUUID().toString();
String keyName = getKeyName();
- BucketLayout bucketLayout = BucketLayout.DEFAULT;
- if (OzoneManagerRatisUtils.isBucketFSOptimized()) {
- bucketLayout = BucketLayout.FILE_SYSTEM_OPTIMIZED;
- }
-
- TestOMRequestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
- omMetadataManager, bucketLayout);
+ addVolumeAndBucket(volumeName, bucketName);
OMRequest initiateMPURequest = doPreExecuteInitiateMPU(volumeName,
bucketName, keyName);
@@ -127,6 +120,12 @@ public class TestS3MultipartUploadCompleteRequest
.get(getOzoneDBKey(volumeName, bucketName, keyName)));
}
+ protected void addVolumeAndBucket(String volumeName, String bucketName)
+ throws Exception {
+ TestOMRequestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
+ omMetadataManager, BucketLayout.DEFAULT);
+ }
+
@Test
public void testInvalidPartOrderError() throws Exception {
String volumeName = UUID.randomUUID().toString();
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestWithFSO.java
index 02eeffa..c6533ef 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequestWithFSO.java
@@ -25,13 +25,11 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import org.apache.hadoop.util.Time;
import org.junit.Assert;
-import org.junit.BeforeClass;
import java.io.IOException;
import java.nio.file.Path;
@@ -45,11 +43,6 @@ import java.util.UUID;
public class TestS3MultipartUploadCompleteRequestWithFSO
extends TestS3MultipartUploadCompleteRequest {
- @BeforeClass
- public static void init() {
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- }
-
@Override
protected String getKeyName() {
String parentDir = UUID.randomUUID().toString() + "/a/b/c";
@@ -59,6 +52,13 @@ public class TestS3MultipartUploadCompleteRequestWithFSO
}
@Override
+ protected void addVolumeAndBucket(String volumeName, String bucketName)
+ throws Exception {
+ TestOMRequestUtils.addVolumeAndBucketToDB(volumeName, bucketName,
+ omMetadataManager, BucketLayout.FILE_SYSTEM_OPTIMIZED);
+ }
+
+ @Override
protected void addKeyToTable(String volumeName, String bucketName,
String keyName, long clientID) throws Exception {
// need to initialize parentID
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org