This is an automated email from the ASF dual-hosted git repository.
umamahesh pushed a commit to branch HDDS-3816-ec
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-3816-ec by this push:
new 4b9d387 HDDS-6294. EC: Make cluster-wide EC configuration take effect
(#3089)
4b9d387 is described below
commit 4b9d38763a2401da61cacc62a2d1dc278aa859dc
Author: Kaijie Chen <[email protected]>
AuthorDate: Thu Feb 17 12:58:52 2022 +0800
HDDS-6294. EC: Make cluster-wide EC configuration take effect (#3089)
---
.../apache/hadoop/ozone/client/OzoneBucket.java | 14 ++---
.../apache/hadoop/ozone/client/rpc/RpcClient.java | 2 +-
.../dist/src/main/smoketest/ec/basic.robot | 18 ++++--
.../dist/src/main/smoketest/ozone-lib/shell.robot | 26 ++++++++-
.../ozone/client/rpc/TestOzoneRpcClient.java | 29 ----------
.../client/rpc/TestOzoneRpcClientAbstract.java | 64 ++++++++++++++++++++--
.../org/apache/hadoop/ozone/om/OzoneManager.java | 14 ++++-
.../ozone/om/request/file/OMFileCreateRequest.java | 11 ----
.../ozone/om/request/key/OMKeyCreateRequest.java | 12 +---
9 files changed, 113 insertions(+), 77 deletions(-)
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
index 0da2386..d24e151 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.hdds.client.ReplicationFactor;
import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
import org.apache.hadoop.ozone.OmUtils;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.ozone.client.io.OzoneInputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
@@ -153,7 +152,8 @@ public class OzoneBucket extends WithMetadata {
this.volumeName = volumeName;
this.name = bucketName;
- this.defaultReplication = ReplicationConfig.getDefault(conf);
+ // Bucket level replication is not configured by default.
+ this.defaultReplication = null;
this.proxy = proxy;
this.ozoneObj = OzoneObjInfo.Builder.newBuilder()
@@ -249,14 +249,8 @@ public class OzoneBucket extends WithMetadata {
.fromTypeAndFactor(defaultReplicationConfig.getType(),
defaultReplicationConfig.getFactor());
} else {
- // This can happen when talk to old server. So, using old client side
- // defaults.
- this.defaultReplication = ReplicationConfig.parse(
- ReplicationType.valueOf(
- conf.get(OzoneConfigKeys.OZONE_REPLICATION_TYPE,
- OzoneConfigKeys.OZONE_REPLICATION_TYPE_DEFAULT)),
- conf.get(OzoneConfigKeys.OZONE_REPLICATION,
- OzoneConfigKeys.OZONE_REPLICATION_DEFAULT), conf);
+ // Bucket level replication is not configured by default.
+ this.defaultReplication = null;
}
}
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index ce87018..5051b0d 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -1169,7 +1169,7 @@ public class RpcClient implements ClientProtocol {
throws IOException {
verifyVolumeName(volumeName);
verifyBucketName(bucketName);
- HddsClientUtils.checkNotNull(keyName, replicationConfig);
+ HddsClientUtils.checkNotNull(keyName);
OmKeyArgs keyArgs = new OmKeyArgs.Builder()
.setVolumeName(volumeName)
.setBucketName(bucketName)
diff --git a/hadoop-ozone/dist/src/main/smoketest/ec/basic.robot
b/hadoop-ozone/dist/src/main/smoketest/ec/basic.robot
index fdd3a1b..121f30f 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ec/basic.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ec/basic.robot
@@ -38,15 +38,17 @@ Prepare For Tests
Test Bucket Creation
${result} = Execute ozone sh volume create /${prefix}vol1
Should not contain ${result} Failed
- ${result} = Execute ozone sh bucket create
/${prefix}vol1/${prefix}ratis
+ ${result} = Execute ozone sh bucket create
/${prefix}vol1/${prefix}default
Should not contain ${result} Failed
- ${result} = Execute ozone sh bucket list /${prefix}vol1 |
jq -r '.[] | select(.name | contains("${prefix}ratis")) |
.replicationConfig.replicationType'
- Should contain ${result} RATIS
+ Verify Bucket Empty Replication Config
/${prefix}vol1/${prefix}default
+ ${result} = Execute ozone sh bucket create --replication 3
--type RATIS /${prefix}vol1/${prefix}ratis
+ Should not contain ${result} Failed
+ Verify Bucket Replica Replication Config
/${prefix}vol1/${prefix}ratis RATIS THREE
${result} = Execute ozone sh bucket create --replication
rs-3-2-1024k --type EC /${prefix}vol1/${prefix}ec
Should not contain ${result} Failed
Verify Bucket EC Replication Config
/${prefix}vol1/${prefix}ec RS 3 2 1048576
-Test key Creation
+Test Key Creation EC Bucket
Execute ozone sh key put
/${prefix}vol1/${prefix}ec/${prefix}1mb /tmp/1mb
Execute ozone sh key put
/${prefix}vol1/${prefix}ec/${prefix}2mb /tmp/2mb
Execute ozone sh key put
/${prefix}vol1/${prefix}ec/${prefix}3mb /tmp/3mb
@@ -59,11 +61,15 @@ Test key Creation
Verify Key EC Replication Config
/${prefix}vol1/${prefix}ec/${prefix}1mb RS 3 2 1048576
+Test Key Creation Default Bucket
+ Execute ozone sh key put
/${prefix}vol1/${prefix}default/${prefix}1mb /tmp/1mb
+ Key Should Match Local File
/${prefix}vol1/${prefix}default/${prefix}1mb /tmp/1mb
+ Verify Key Replica Replication Config
/${prefix}vol1/${prefix}default/${prefix}1mb RATIS THREE
+
Test Ratis Key EC Bucket
Execute ozone sh key put
--replication=THREE --type=RATIS /${prefix}vol1/${prefix}ec/${prefix}1mbRatis
/tmp/1mb
Key Should Match Local File
/${prefix}vol1/${prefix}ec/${prefix}1mbRatis /tmp/1mb
- ${result} Execute ozone sh key info
/${prefix}vol1/${prefix}ec/${prefix}1mbRatis | jq -r
'.replicationConfig.replicationType'
- Should Match Regexp ${result} ^(?m)RATIS$
+ Verify Key Replica Replication Config
/${prefix}vol1/${prefix}ec/${prefix}1mbRatis RATIS THREE
Test EC Key Ratis Bucket
Execute ozone sh key put
--replication=rs-3-2-1024k --type=EC
/${prefix}vol1/${prefix}ratis/${prefix}1mbEC /tmp/1mb
diff --git a/hadoop-ozone/dist/src/main/smoketest/ozone-lib/shell.robot
b/hadoop-ozone/dist/src/main/smoketest/ozone-lib/shell.robot
index c31f9bc..07753a3 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ozone-lib/shell.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ozone-lib/shell.robot
@@ -62,17 +62,37 @@ Create Key
Should not contain ${output} Failed
Log Uploaded ${file} to ${key}
+Verify Bucket Empty Replication Config
+ [arguments] ${bucket}
+ ${result} = Execute ozone sh bucket info ${bucket}
| jq -r '.replicationConfig'
+ Should Be Equal ${result} null
+
+Verify Bucket Replica Replication Config
+ [arguments] ${bucket} ${type} ${factor}
+ ${result} = Execute ozone sh bucket info ${bucket}
| jq -r '.replicationConfig.replicationType,
.replicationConfig.replicationFactor'
+ Verify Replica Replication Config ${result} ${type}
${factor}
+
+Verify Key Replica Replication Config
+ [arguments] ${key} ${type} ${factor}
+ ${result} = Execute ozone sh key info ${key} | jq
-r '.replicationConfig.replicationType, .replicationConfig.replicationFactor'
+ Verify Replica Replication Config ${result} ${type}
${factor}
+
+Verify Replica Replication Config
+ [arguments] ${result} ${type} ${factor}
+ Should Match Regexp ${result} ^(?m)${type}$
+ Should Match Regexp ${result} ^(?m)${factor}$
+
Verify Bucket EC Replication Config
[arguments] ${bucket} ${encoding} ${data} ${parity}
${chunksize}
${result} = Execute ozone sh bucket info ${bucket}
| jq -r '.replicationConfig.replicationType, .replicationConfig.codec,
.replicationConfig.data, .replicationConfig.parity,
.replicationConfig.ecChunkSize'
- Verify Replication Config ${result} ${encoding}
${data} ${parity} ${chunksize}
+ Verify EC Replication Config ${result} ${encoding}
${data} ${parity} ${chunksize}
Verify Key EC Replication Config
[arguments] ${key} ${encoding} ${data} ${parity}
${chunksize}
${result} = Execute ozone sh key info ${key} | jq
-r '.replicationConfig.replicationType, .replicationConfig.codec,
.replicationConfig.data, .replicationConfig.parity,
.replicationConfig.ecChunkSize'
- Verify Replication Config ${result} ${encoding}
${data} ${parity} ${chunksize}
+ Verify EC Replication Config ${result} ${encoding}
${data} ${parity} ${chunksize}
-Verify Replication Config
+Verify EC Replication Config
[arguments] ${result} ${encoding} ${data} ${parity}
${chunksize}
Should Match Regexp ${result} ^(?m)EC$
Should Match Regexp ${result} ^(?m)${encoding}$
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
index 93ee394..7c75130 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
@@ -19,23 +19,13 @@
package org.apache.hadoop.ozone.client.rpc;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.UUID;
-
-import org.apache.hadoop.hdds.client.DefaultReplicationConfig;
-import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.ozone.client.BucketArgs;
-import org.apache.hadoop.ozone.client.OzoneBucket;
-import org.apache.hadoop.ozone.client.OzoneVolume;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Rule;
-import org.junit.Test;
import org.junit.rules.Timeout;
@@ -74,23 +64,4 @@ public class TestOzoneRpcClient extends
TestOzoneRpcClientAbstract {
public static void shutdown() throws IOException {
shutdownCluster();
}
-
- @Test
- public void testCreateAndListBucketReturnsCorrectRepConfigf()
- throws Exception {
- ECReplicationConfig repConfig = new ECReplicationConfig(3, 2);
- String volumeName = UUID.randomUUID().toString();
- String bucketName = UUID.randomUUID().toString();
- getStore().createVolume(volumeName);
- OzoneVolume volume = getStore().getVolume(volumeName);
-
- BucketArgs bucketArgs = BucketArgs.newBuilder()
- .setDefaultReplicationConfig(new DefaultReplicationConfig(repConfig))
- .build();
- volume.createBucket(bucketName, bucketArgs);
-
- Iterator<? extends OzoneBucket> iterator = volume.listBuckets(null);
- OzoneBucket bucket = iterator.next();
- Assert.assertEquals(repConfig, bucket.getReplicationConfig());
- }
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
index b275d91..c1256bc 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
@@ -591,7 +591,7 @@ public abstract class TestOzoneRpcClientAbstract {
@Test
public void testCreateBucketWithVersioning()
- throws IOException, OzoneClientException {
+ throws IOException {
String volumeName = UUID.randomUUID().toString();
String bucketName = UUID.randomUUID().toString();
store.createVolume(volumeName);
@@ -639,6 +639,23 @@ public abstract class TestOzoneRpcClientAbstract {
}
@Test
+ public void testCreateBucketWithReplicationConfig()
+ throws IOException {
+ String volumeName = UUID.randomUUID().toString();
+ String bucketName = UUID.randomUUID().toString();
+ ReplicationConfig repConfig = new ECReplicationConfig(3, 2);
+ store.createVolume(volumeName);
+ OzoneVolume volume = store.getVolume(volumeName);
+ BucketArgs bucketArgs = BucketArgs.newBuilder()
+ .setDefaultReplicationConfig(new DefaultReplicationConfig(repConfig))
+ .build();
+ volume.createBucket(bucketName, bucketArgs);
+ OzoneBucket bucket = volume.getBucket(bucketName);
+ Assert.assertEquals(bucketName, bucket.getName());
+ Assert.assertEquals(repConfig, bucket.getReplicationConfig());
+ }
+
+ @Test
public void testCreateBucketWithAllArgument()
throws IOException {
String volumeName = UUID.randomUUID().toString();
@@ -647,18 +664,21 @@ public abstract class TestOzoneRpcClientAbstract {
ACLType.ALL, ACCESS);
List<OzoneAcl> acls = new ArrayList<>();
acls.add(userAcl);
+ ReplicationConfig repConfig = new ECReplicationConfig(3, 2);
store.createVolume(volumeName);
OzoneVolume volume = store.getVolume(volumeName);
BucketArgs.Builder builder = BucketArgs.newBuilder();
builder.setVersioning(true)
.setStorageType(StorageType.SSD)
- .setAcls(acls);
+ .setAcls(acls)
+ .setDefaultReplicationConfig(new DefaultReplicationConfig(repConfig));
volume.createBucket(bucketName, builder.build());
OzoneBucket bucket = volume.getBucket(bucketName);
Assert.assertEquals(bucketName, bucket.getName());
Assert.assertEquals(true, bucket.getVersioning());
Assert.assertEquals(StorageType.SSD, bucket.getStorageType());
Assert.assertTrue(bucket.getAcls().contains(userAcl));
+ Assert.assertEquals(repConfig, bucket.getReplicationConfig());
}
@Test
@@ -672,7 +692,6 @@ public abstract class TestOzoneRpcClientAbstract {
"Bucket or Volume name has an unsupported" +
" character : #",
() -> volume.createBucket(bucketName));
-
}
@Test
@@ -801,7 +820,6 @@ public abstract class TestOzoneRpcClientAbstract {
Assert.assertEquals(StorageType.SSD, newBucket.getStorageType());
}
-
@Test
public void testDeleteBucket()
throws Exception {
@@ -2015,7 +2033,6 @@ public abstract class TestOzoneRpcClientAbstract {
.startsWith(bucketBaseNameA + i + "-"));
}
Assert.assertFalse(volBBucketAIter.hasNext());
-
}
@Test
@@ -2031,6 +2048,43 @@ public abstract class TestOzoneRpcClientAbstract {
}
@Test
+ public void testListBucketsReplicationConfig()
+ throws Exception {
+ String volumeName = UUID.randomUUID().toString();
+ getStore().createVolume(volumeName);
+ OzoneVolume volume = getStore().getVolume(volumeName);
+
+ // bucket-level replication config: null (default)
+ String bucketName = UUID.randomUUID().toString();
+ volume.createBucket(bucketName);
+ OzoneBucket bucket = volume.listBuckets(bucketName).next();
+ Assert.assertNull(bucket.getReplicationConfig());
+
+ // bucket-level replication config: EC/rs-3-2-1024k
+ String ecBucketName = UUID.randomUUID().toString();
+ ReplicationConfig ecRepConfig = new ECReplicationConfig(3, 2);
+ BucketArgs ecBucketArgs = BucketArgs.newBuilder()
+ .setDefaultReplicationConfig(
+ new DefaultReplicationConfig(ecRepConfig))
+ .build();
+ volume.createBucket(ecBucketName, ecBucketArgs);
+ OzoneBucket ecBucket = volume.listBuckets(ecBucketName).next();
+ Assert.assertEquals(ecRepConfig, ecBucket.getReplicationConfig());
+
+ // bucket-level replication config: RATIS/THREE
+ String ratisBucketName = UUID.randomUUID().toString();
+ ReplicationConfig ratisRepConfig = ReplicationConfig
+ .fromTypeAndFactor(RATIS, THREE);
+ BucketArgs ratisBucketArgs = BucketArgs.newBuilder()
+ .setDefaultReplicationConfig(
+ new DefaultReplicationConfig(ratisRepConfig))
+ .build();
+ volume.createBucket(ratisBucketName, ratisBucketArgs);
+ OzoneBucket ratisBucket = volume.listBuckets(ratisBucketName).next();
+ Assert.assertEquals(ratisRepConfig, ratisBucket.getReplicationConfig());
+ }
+
+ @Test
public void testListKey()
throws IOException {
String volumeA = "vol-a-" + RandomStringUtils.randomNumeric(5);
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 2322b6d..e773ad9 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
@@ -61,6 +61,7 @@ import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.client.ReplicationConfig;
+import org.apache.hadoop.hdds.client.ReplicationType;
import org.apache.hadoop.hdds.conf.ConfigurationException;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -238,6 +239,10 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_VOLUME_LISTALL_AL
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_VOLUME_LISTALL_ALLOWED_DEFAULT;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT_DEFAULT;
+import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SERVER_DEFAULT_REPLICATION_DEFAULT;
+import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SERVER_DEFAULT_REPLICATION_KEY;
+import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SERVER_DEFAULT_REPLICATION_TYPE_DEFAULT;
+import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SERVER_DEFAULT_REPLICATION_TYPE_KEY;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.DETECTED_LOOP_IN_BUCKET_LINKS;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.INVALID_AUTH_METHOD;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.INVALID_REQUEST;
@@ -3677,7 +3682,14 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
}
public ReplicationConfig getDefaultReplicationConfig() {
- return ReplicationConfig.getDefault(configuration);
+ final String replication = configuration.getTrimmed(
+ OZONE_SERVER_DEFAULT_REPLICATION_KEY,
+ OZONE_SERVER_DEFAULT_REPLICATION_DEFAULT);
+ final String type = configuration.getTrimmed(
+ OZONE_SERVER_DEFAULT_REPLICATION_TYPE_KEY,
+ OZONE_SERVER_DEFAULT_REPLICATION_TYPE_DEFAULT);
+ return ReplicationConfig.parse(ReplicationType.valueOf(type),
+ replication, configuration);
}
public String getOMDefaultBucketLayout() {
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 7d60e77..58deb8e 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
@@ -120,19 +120,8 @@ public class OMFileCreateRequest extends OMKeyRequest {
final long requestedSize = keyArgs.getDataSize() > 0 ?
keyArgs.getDataSize() : scmBlockSize;
- boolean useRatis = ozoneManager.shouldUseRatis();
-
HddsProtos.ReplicationFactor factor = keyArgs.getFactor();
- if (factor == null) {
- factor = useRatis ? HddsProtos.ReplicationFactor.THREE :
- HddsProtos.ReplicationFactor.ONE;
- }
-
HddsProtos.ReplicationType type = keyArgs.getType();
- if (type == null) {
- type = useRatis ? HddsProtos.ReplicationType.RATIS :
- HddsProtos.ReplicationType.STAND_ALONE;
- }
final OmBucketInfo bucketInfo = ozoneManager
.getBucketInfo(keyArgs.getVolumeName(), keyArgs.getBucketName());
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
index 791548d..ab388b0 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequest.java
@@ -129,19 +129,9 @@ public class OMKeyCreateRequest extends OMKeyRequest {
final long requestedSize = keyArgs.getDataSize() > 0 ?
keyArgs.getDataSize() : scmBlockSize;
- boolean useRatis = ozoneManager.shouldUseRatis();
-
HddsProtos.ReplicationFactor factor = keyArgs.getFactor();
- if (factor == null) {
- factor = useRatis ? HddsProtos.ReplicationFactor.THREE :
- HddsProtos.ReplicationFactor.ONE;
- }
-
HddsProtos.ReplicationType type = keyArgs.getType();
- if (type == null) {
- type = useRatis ? HddsProtos.ReplicationType.RATIS :
- HddsProtos.ReplicationType.STAND_ALONE;
- }
+
final OmBucketInfo bucketInfo = ozoneManager
.getBucketInfo(keyArgs.getVolumeName(), keyArgs.getBucketName());
final ReplicationConfig repConfig = OzoneConfigUtil
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
