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/04/07 10:03:19 UTC
[ozone] branch HDDS-2939 updated: HDDS-4727. [FSO]OMConfig: Modify
'ozone.om.layout.version' config (#2118)
This is an automated email from the ASF dual-hosted git repository.
rakeshr pushed a commit to branch HDDS-2939
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-2939 by this push:
new a7fb5d5 HDDS-4727. [FSO]OMConfig: Modify 'ozone.om.layout.version' config (#2118)
a7fb5d5 is described below
commit a7fb5d55c86289079a5a7d99924f60f3eb54d7eb
Author: Sadanand Shenoy <sa...@gmail.com>
AuthorDate: Wed Apr 7 15:32:59 2021 +0530
HDDS-4727. [FSO]OMConfig: Modify 'ozone.om.layout.version' config (#2118)
---
.../common/src/main/resources/ozone-default.xml | 13 ++++++++-----
.../org/apache/hadoop/ozone/om/OMConfigKeys.java | 19 +++++++++++--------
.../hadoop/ozone/om/helpers/OzoneFSUtils.java | 10 +++++-----
.../src/main/compose/ozone/docker-compose.yaml | 14 +++++++-------
hadoop-ozone/dist/src/main/compose/ozone/test.sh | 8 ++++----
.../TestDirectoryDeletingServiceWithFSOBucket.java | 2 +-
.../apache/hadoop/fs/ozone/TestOzoneDirectory.java | 2 +-
.../hadoop/fs/ozone/TestOzoneFileInterfacesV1.java | 4 ++--
.../apache/hadoop/fs/ozone/TestOzoneFileOps.java | 2 +-
.../hadoop/fs/ozone/TestOzoneFileSystem.java | 6 +++---
.../fs/ozone/TestOzoneFileSystemPrefixParser.java | 2 +-
.../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 2 +-
.../hadoop/fs/ozone/contract/OzoneContract.java | 4 ++--
.../rpc/TestOzoneClientMultipartUploadV1.java | 2 +-
.../hadoop/ozone/client/rpc/TestReadRetries.java | 4 ++--
.../ozone/freon/TestHadoopDirTreeGeneratorV1.java | 2 +-
.../apache/hadoop/ozone/om/TestObjectStoreV1.java | 2 +-
.../org/apache/hadoop/ozone/om/OzoneManager.java | 22 +++++++++++-----------
.../om/request/bucket/OMBucketCreateRequest.java | 6 +++---
.../ozone/om/request/TestOMRequestUtils.java | 6 +++---
.../ozone/om/request/bucket/TestBucketRequest.java | 2 +-
.../bucket/TestOMBucketCreateRequestV1.java | 4 ++--
.../file/TestOMDirectoryCreateRequestV1.java | 2 +-
23 files changed, 73 insertions(+), 67 deletions(-)
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index 665ccd9..99b3060 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -2762,12 +2762,15 @@
</property>
<property>
- <name>ozone.om.layout.version</name>
+ <name>ozone.om.metadata.layout</name>
<tag>OZONE, OM</tag>
- <value>V0</value>
- <description>Temporary workaround for OM upgrade and will be replaced once
- upgrade HDDS-3698 story reaches consensus. Defaulting to 'V0' so that
- existing unit test cases won't be affected. New OM version should be 'V1'
+ <value>LEGACY</value>
+ <description>
+ This property is used to define the metadata layout of file system
+ paths. If it is configured as PREFIX in combination with
+ ozone.om.enable.filesystem.paths to true then this allows to perform
+ atomic rename and delete of any directory at any level in the namespace.
+ Defaulting to LEGACY. Supported values: LEGACY and PREFIX.
</description>
</property>
<property>
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
index 6a64818..971e248 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
@@ -245,14 +245,17 @@ public final class OMConfigKeys {
public static final long OZONE_FS_TRASH_CHECKPOINT_INTERVAL_DEFAULT = 0;
- // TODO: Temporary workaround for OM upgrade path and will be replaced once
- // upgrade HDDS-3698 story reaches consensus. Defaulting to 'V0' so that
- // existing unit test cases won't be affected. New OM version should be 'V1'.
- public static final String OZONE_OM_LAYOUT_VERSION =
- "ozone.om.layout.version";
- public static final String OZONE_OM_LAYOUT_VERSION_DEFAULT = "V0";
-
- public static final String OZONE_OM_LAYOUT_VERSION_V1 = "V1";
+// This property is used to define the metadata layout of file system
+// paths. If it is configured as PREFIX in combination with
+// ozone.om.enable.filesystem.paths to true then this allows to perform
+// atomic rename and delete of any directory at any level in the namespace.
+// Defaulting to LEGACY. Supported values: LEGACY and PREFIX.
+
+ public static final String OZONE_OM_METADATA_LAYOUT =
+ "ozone.om.metadata.layout";
+ public static final String OZONE_OM_METADATA_LAYOUT_DEFAULT = "LEGACY";
+
+ public static final String OZONE_OM_METADATA_LAYOUT_PREFIX = "PREFIX";
/**
* Configuration properties for Directory Deleting Service.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java
index f1f6454..4f2ba36 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneFSUtils.java
@@ -216,18 +216,18 @@ public final class OzoneFSUtils {
*/
public static boolean isFSOptimizedBucket(
Map<String, String> bucketMetadata) {
- // layout version V1 represents optimized FS path
- boolean layoutVersionEnabled =
+ // layout 'PREFIX' represents optimized FS path
+ boolean metadataLayoutEnabled =
org.apache.commons.lang3.StringUtils.equalsIgnoreCase(
- OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1,
+ OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX,
bucketMetadata
- .get(OMConfigKeys.OZONE_OM_LAYOUT_VERSION));
+ .get(OMConfigKeys.OZONE_OM_METADATA_LAYOUT));
boolean fsEnabled =
Boolean.parseBoolean(bucketMetadata
.get(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS));
- return layoutVersionEnabled && fsEnabled;
+ return metadataLayoutEnabled && fsEnabled;
}
public static String removeTrailingSlashIfNeeded(String key) {
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
index b7b450d..6328be4 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -26,8 +26,8 @@ x-common-config:
- docker-config
x-layout_version:
- &layout_version
- OZONE-SITE.XML_ozone.om.layout.version: ${OZONE_OM_LAYOUT_VERSION:-V0}
+ &metadata_layout
+ OZONE-SITE.XML_ozone.om.metadata.layout: ${OZONE_OM_METADATA_LAYOUT:-LEGACY}
OZONE-SITE.XML_ozone.om.enable.filesystem.paths: ${OZONE_OM_ENABLE_FILESYSTEM_PATHS:-false}
x-replication:
@@ -42,7 +42,7 @@ services:
- 9882
environment:
<<: *replication
- <<: *layout_version
+ <<: *metadata_layout
OZONE_OPTS:
command: ["ozone","datanode"]
om:
@@ -51,7 +51,7 @@ services:
ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
OZONE_OPTS:
<<: *replication
- <<: *layout_version
+ <<: *metadata_layout
ports:
- 9874:9874
- 9862:9862
@@ -66,14 +66,14 @@ services:
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1}
OZONE_OPTS:
<<: *replication
- <<: *layout_version
+ <<: *metadata_layout
command: ["ozone","scm"]
s3g:
<<: *common-config
environment:
OZONE_OPTS:
<<: *replication
- <<: *layout_version
+ <<: *metadata_layout
ports:
- 9878:9878
command: ["ozone","s3g"]
@@ -84,5 +84,5 @@ services:
environment:
OZONE_OPTS:
<<: *replication
- <<: *layout_version
+ <<: *metadata_layout
command: ["ozone","recon"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
index 6de26ab..c2af02f 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
@@ -53,9 +53,9 @@ stop_docker_env
# running FS tests with different config requires restart of the cluster
export OZONE_KEEP_RESULTS=true
-export OZONE_OM_LAYOUT_VERSION OZONE_OM_ENABLE_FILESYSTEM_PATHS
-for OZONE_OM_LAYOUT_VERSION in V0 V1; do
- if [[ $OZONE_OM_LAYOUT_VERSION == "V1" ]]; then
+export OZONE_OM_METADATA_LAYOUT OZONE_OM_ENABLE_FILESYSTEM_PATHS
+for OZONE_OM_METADATA_LAYOUT in LEGACY PREFIX; do
+ if [[ $OZONE_OM_METADATA_LAYOUT == "PREFIX" ]]; then
OZONE_OM_ENABLE_FILESYSTEM_PATHS=true
else
OZONE_OM_ENABLE_FILESYSTEM_PATHS=false
@@ -64,7 +64,7 @@ for OZONE_OM_LAYOUT_VERSION in V0 V1; do
start_docker_env
for scheme in ofs o3fs; do
for bucket in link bucket; do
- execute_robot_test scm -v SCHEME:${scheme} -v BUCKET_TYPE:${bucket} -N ozonefs-${OZONE_OM_LAYOUT_VERSION}-${scheme}-${bucket} ozonefs/ozonefs.robot
+ execute_robot_test scm -v SCHEME:${scheme} -v BUCKET_TYPE:${bucket} -N ozonefs-${OZONE_OM_METADATA_LAYOUT}-${scheme}-${bucket} ozonefs/ozonefs.robot
done
done
stop_docker_env
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSOBucket.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSOBucket.java
index aa2d8e7..df2e47b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSOBucket.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSOBucket.java
@@ -86,7 +86,7 @@ public class TestDirectoryDeletingServiceWithFSOBucket {
conf.setBoolean(OZONE_ACL_ENABLED, true);
if (isBucketFSOptimized) {
TestOMRequestUtils.configureFSOptimizedPaths(conf,
- enabledFileSystemPaths, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ enabledFileSystemPaths, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
} 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/TestOzoneDirectory.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneDirectory.java
index 22ed13e..3763295 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneDirectory.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneDirectory.java
@@ -151,7 +151,7 @@ public class TestOzoneDirectory {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setInt(FS_TRASH_INTERVAL_KEY, 1);
TestOMRequestUtils.configureFSOptimizedPaths(conf,
- true, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(3)
.build();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesV1.java
index d716457..de484ea 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfacesV1.java
@@ -45,8 +45,8 @@ public class TestOzoneFileInterfacesV1 extends TestOzoneFileInterfaces {
@Override
protected OzoneConfiguration getOzoneConfiguration() {
OzoneConfiguration conf = new OzoneConfiguration();
- TestOMRequestUtils.configureFSOptimizedPaths(conf,
- enableFileSystemPaths, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ TestOMRequestUtils.configureFSOptimizedPaths(conf, enableFileSystemPaths,
+ OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
return conf;
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileOps.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileOps.java
index 147a9ce..c0f228d 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileOps.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileOps.java
@@ -73,7 +73,7 @@ public class TestOzoneFileOps {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setInt(FS_TRASH_INTERVAL_KEY, 1);
TestOMRequestUtils.configureFSOptimizedPaths(conf,
- true, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(3)
.build();
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 3d25e72..bddc21f 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
@@ -149,11 +149,11 @@ public class TestOzoneFileSystem {
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
conf.setBoolean(OZONE_ACL_ENABLED, true);
if (isBucketFSOptimized) {
- TestOMRequestUtils.configureFSOptimizedPaths(conf,
- enabledFileSystemPaths, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ TestOMRequestUtils.configureFSOptimizedPaths(conf, enabledFileSystemPaths,
+ OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
} else {
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
- enabledFileSystemPaths);
+ enabledFileSystemPaths);
}
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(3)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemPrefixParser.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemPrefixParser.java
index 3f18fae..4cd8750 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemPrefixParser.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemPrefixParser.java
@@ -62,7 +62,7 @@ public class TestOzoneFileSystemPrefixParser {
configuration = new OzoneConfiguration();
TestOMRequestUtils.configureFSOptimizedPaths(configuration,
- true, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
cluster = MiniOzoneCluster.newBuilder(configuration)
.setNumDatanodes(3)
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 b5b7703..813965e 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
@@ -156,7 +156,7 @@ public class TestRootedOzoneFileSystem {
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
if (isBucketFSOptimized) {
TestOMRequestUtils.configureFSOptimizedPaths(conf,
- true, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
} 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/contract/OzoneContract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java
index f401c06..925ef6a 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/OzoneContract.java
@@ -88,8 +88,8 @@ class OzoneContract extends AbstractFSContract {
if (fsOptimizedServer){
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
true);
- conf.set(OMConfigKeys.OZONE_OM_LAYOUT_VERSION,
- OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ conf.set(OMConfigKeys.OZONE_OM_METADATA_LAYOUT,
+ OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
}
cluster = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(5).build();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadV1.java
index 0e981d6..b248b72 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadV1.java
@@ -106,7 +106,7 @@ public class TestOzoneClientMultipartUploadV1 {
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
TestOMRequestUtils.configureFSOptimizedPaths(conf,
- true, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
startCluster(conf);
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java
index 446ed5c..f94e47e 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestReadRetries.java
@@ -103,8 +103,8 @@ public class TestReadRetries {
@Parameterized.Parameters
public static Collection<Object[]> data() {
return Arrays.asList(
- new Object[]{OMConfigKeys.OZONE_OM_LAYOUT_VERSION_DEFAULT},
- new Object[]{OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1});
+ new Object[]{OMConfigKeys.OZONE_OM_METADATA_LAYOUT_DEFAULT },
+ new Object[]{OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX });
}
/**
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorV1.java
index 01a73bc..ff036e7 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/freon/TestHadoopDirTreeGeneratorV1.java
@@ -28,7 +28,7 @@ public class TestHadoopDirTreeGeneratorV1 extends TestHadoopDirTreeGenerator {
protected OzoneConfiguration getOzoneConfiguration() {
OzoneConfiguration conf = new OzoneConfiguration();
TestOMRequestUtils.configureFSOptimizedPaths(conf,
- true, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
return conf;
}
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreV1.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreV1.java
index 0e44c9d..e6f943f 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreV1.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreV1.java
@@ -102,7 +102,7 @@ public class TestObjectStoreV1 {
scmId = UUID.randomUUID().toString();
omId = UUID.randomUUID().toString();
TestOMRequestUtils.configureFSOptimizedPaths(conf,
- true, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
cluster = MiniOzoneCluster.newBuilder(conf)
.setClusterId(clusterId)
.setScmId(scmId)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index d50ff3d..a5387f8 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -216,9 +216,9 @@ import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HANDLER_COUNT_DEF
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_HANDLER_COUNT_KEY;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_KERBEROS_KEYTAB_FILE_KEY;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_KERBEROS_PRINCIPAL_KEY;
-import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_LAYOUT_VERSION;
-import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_LAYOUT_VERSION_DEFAULT;
-import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_METADATA_LAYOUT;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_METADATA_LAYOUT_DEFAULT;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_METRICS_SAVE_INTERVAL;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_METRICS_SAVE_INTERVAL_DEFAULT;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_USER_MAX_VOLUME;
@@ -1112,7 +1112,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
// TODO: Temporary workaround for OM upgrade path and will be replaced once
// upgrade HDDS-3698 story reaches consensus. Instead of cluster level
// configuration, OM needs to check this property on every bucket level.
- getOMLayoutVersion();
+ getOMMetadataLayout();
metadataManager.start(configuration);
startSecretManagerIfNecessary();
@@ -3689,16 +3689,16 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
OZONE_OM_ENABLE_FILESYSTEM_PATHS_DEFAULT);
}
- public String getOMLayoutVersion() {
- String version = configuration.getTrimmed(OZONE_OM_LAYOUT_VERSION,
- OZONE_OM_LAYOUT_VERSION_DEFAULT);
- boolean omLayoutVersionV1 = StringUtils.equalsIgnoreCase(version,
- OZONE_OM_LAYOUT_VERSION_V1);
+ public String getOMMetadataLayout() {
+ String version = configuration.getTrimmed(OZONE_OM_METADATA_LAYOUT,
+ OZONE_OM_METADATA_LAYOUT_DEFAULT);
+ boolean omMetadataLayoutPrefix = StringUtils.equalsIgnoreCase(version,
+ OZONE_OM_METADATA_LAYOUT_PREFIX);
LOG.info("Configured {}={} and enabled:{} optimized OM FS operations",
- OZONE_OM_LAYOUT_VERSION, version, omLayoutVersionV1);
+ OZONE_OM_METADATA_LAYOUT, version, omMetadataLayoutPrefix);
boolean isBucketFSOptimized =
- omLayoutVersionV1 && getEnableFileSystemPaths();
+ omMetadataLayoutPrefix && getEnableFileSystemPaths();
OzoneManagerRatisUtils.setBucketFSOptimized(isBucketFSOptimized);
return version;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
index 76c4e42..5624333 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java
@@ -382,9 +382,9 @@ public class OMBucketCreateRequest extends OMClientRequest {
}
// TODO: Many unit test cases has null config and done a simple null
// check now. It can be done later, to avoid massive test code changes.
- if(StringUtils.isNotBlank(ozoneManager.getOMLayoutVersion())){
- String layOutVersion = ozoneManager.getOMLayoutVersion();
- metadata.put(OMConfigKeys.OZONE_OM_LAYOUT_VERSION, layOutVersion);
+ if(StringUtils.isNotBlank(ozoneManager.getOMMetadataLayout())){
+ String metadataLayout = ozoneManager.getOMMetadataLayout();
+ metadata.put(OMConfigKeys.OZONE_OM_METADATA_LAYOUT, metadataLayout);
boolean fsPathsEnabled = ozoneManager.getEnableFileSystemPaths();
metadata.put(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
Boolean.toString(fsPathsEnabled));
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 eca06f9..d994834 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
@@ -467,8 +467,8 @@ public final class TestOMRequestUtils {
metadataList.add(HddsProtos.KeyValue.newBuilder().setKey("key2").setValue(
"value2").build());
metadataList.add(HddsProtos.KeyValue.newBuilder().setKey(
- OMConfigKeys.OZONE_OM_LAYOUT_VERSION).setValue(
- OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1).build());
+ OMConfigKeys.OZONE_OM_METADATA_LAYOUT).setValue(
+ OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX).build());
metadataList.add(HddsProtos.KeyValue.newBuilder().setKey(
OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS).setValue(
"false").build());
@@ -967,6 +967,6 @@ public final class TestOMRequestUtils {
boolean enableFileSystemPaths, String version) {
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
enableFileSystemPaths);
- conf.set(OMConfigKeys.OZONE_OM_LAYOUT_VERSION, version);
+ conf.set(OMConfigKeys.OZONE_OM_METADATA_LAYOUT, version);
}
}
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java
index 9381746..873deda 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestBucketRequest.java
@@ -74,7 +74,7 @@ public class TestBucketRequest {
auditLogger = Mockito.mock(AuditLogger.class);
when(ozoneManager.getAuditLogger()).thenReturn(auditLogger);
Mockito.doNothing().when(auditLogger).logWrite(any(AuditMessage.class));
- when(ozoneManager.getOMLayoutVersion()).thenReturn(null);
+ when(ozoneManager.getOMMetadataLayout()).thenReturn(null);
}
@After
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestV1.java
index a3b6ff7..0e4d6ab 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestV1.java
@@ -39,8 +39,8 @@ public class TestOMBucketCreateRequestV1 extends TestOMBucketCreateRequest {
@Test
public void testValidateAndUpdateCacheWithFSOBucket() throws Exception {
- when(ozoneManager.getOMLayoutVersion()).thenReturn(
- OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ when(ozoneManager.getOMMetadataLayout()).thenReturn(
+ OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestV1.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestV1.java
index d8c8108..15c3875 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestV1.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequestV1.java
@@ -90,7 +90,7 @@ public class TestOMDirectoryCreateRequestV1 {
ozoneConfiguration.set(OMConfigKeys.OZONE_OM_DB_DIRS,
folder.newFolder().getAbsolutePath());
TestOMRequestUtils.configureFSOptimizedPaths(ozoneConfiguration,
- true, OMConfigKeys.OZONE_OM_LAYOUT_VERSION_V1);
+ true, OMConfigKeys.OZONE_OM_METADATA_LAYOUT_PREFIX);
omMetadataManager = new OmMetadataManagerImpl(ozoneConfiguration);
when(ozoneManager.getMetrics()).thenReturn(omMetrics);
when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org