HDDS-5073. Use ReplicationConfig on client side

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/RatisReplicationConfig.java

@@ -35,6 +35,21 @@ public RatisReplicationConfig(ReplicationFactor replicationFactor) {
     this.replicationFactor = replicationFactor;
   }
 
+  public RatisReplicationConfig(String factorString) {
+    ReplicationFactor factor = null;
+    try {
+      factor = ReplicationFactor.valueOf(Integer.parseInt(factorString));
+    } catch (NumberFormatException ex) {
+      try {
+        factor = ReplicationFactor.valueOf(factorString);
+      } catch (IllegalArgumentException x) {
+        throw new IllegalArgumentException("Invalid RatisReplicationFactor '" +
+                factorString + "'. Please use ONE or THREE!");
+      }
+    }
+    this.replicationFactor = factor;
+  }
+
   public static boolean hasFactor(ReplicationConfig replicationConfig,
       ReplicationFactor factor) {
     if (replicationConfig instanceof RatisReplicationConfig) {

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ReplicationConfig.java

@@ -18,6 +18,7 @@
 
 package org.apache.hadoop.hdds.client;
 
+import org.apache.hadoop.hdds.conf.ConfigurationSource;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 
 /**
@@ -47,6 +48,24 @@ static ReplicationConfig fromTypeAndFactor(
     }
   }
 
+  /**
+   * Helper method to create proper replication method from old-style
+   * factor+type definition.
+   * <p>
+   * Note: it's never used for EC replication where config is created.
+   */
+  static ReplicationConfig fromTypeAndFactor(
+      org.apache.hadoop.hdds.client.ReplicationType type,
+      org.apache.hadoop.hdds.client.ReplicationFactor factor
+  ) {
+    return fromTypeAndFactor(HddsProtos.ReplicationType.valueOf(type.name()),
+        HddsProtos.ReplicationFactor.valueOf(factor.name()));
+  }
+
+  static ReplicationConfig getDefault(ConfigurationSource config) {
+    return new RatisReplicationConfig(HddsProtos.ReplicationFactor.THREE);
+  }
+
   /**
    * Helper method to serialize from proto.
    * <p>
@@ -85,6 +104,42 @@ static HddsProtos.ReplicationFactor getLegacyFactor(
             .getReplicationType());
   }
 
+  /**
+   * Create new replication config with adjusted replication factor.
+   * <p>
+   * Used by hadoop file system. Some replication scheme (like EC) may not
+   * support changing the replication.
+   */
+  static ReplicationConfig adjustReplication(
+      ReplicationConfig replicationConfig, short replication) {
+    switch (replicationConfig.getReplicationType()) {
+    case RATIS:
+      return new RatisReplicationConfig(
+          org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor
+              .valueOf(replication));
+    case STAND_ALONE:
+      return new StandaloneReplicationConfig(
+          org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor
+              .valueOf(replication));
+    default:
+      return replicationConfig;
+    }
+  }
+
+  static ReplicationConfig fromTypeAndString(ReplicationType replicationType,
+      String replication) {
+    switch (replicationType) {
+    case RATIS:
+      return new RatisReplicationConfig(replication);
+    case STAND_ALONE:
+      return new StandaloneReplicationConfig(replication);
+    default:
+      throw new UnsupportedOperationException(
+          "String based replication config initialization is not supported for "
+              + replicationType);
+    }
+  }
+
   /**
    * Replication type supported by the replication config.
    */

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/StandaloneReplicationConfig.java

@@ -34,6 +34,15 @@ public StandaloneReplicationConfig(ReplicationFactor replicationFactor) {
     this.replicationFactor = replicationFactor;
   }
 
+  public StandaloneReplicationConfig(String factorString) {
+    ReplicationFactor factor = null;
+    try {
+      factor = ReplicationFactor.valueOf(Integer.parseInt(factorString));
+    } catch (NumberFormatException ex) {
+      factor = ReplicationFactor.valueOf(factorString);
+    }
+    this.replicationFactor = factor;
+  }
   public ReplicationFactor getReplicationFactor() {
     return replicationFactor;
   }

hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java

@@ -150,8 +150,8 @@ public final class OzoneConfigKeys {
   public static final int OZONE_CLIENT_CONNECTION_TIMEOUT_DEFAULT = 5000;
 
   public static final String OZONE_REPLICATION = "ozone.replication";
-  public static final int OZONE_REPLICATION_DEFAULT =
-      ReplicationFactor.THREE.getValue();
+  public static final String OZONE_REPLICATION_DEFAULT =
+      ReplicationFactor.THREE.toString();
 
   public static final String OZONE_REPLICATION_TYPE = "ozone.replication.type";
   public static final String OZONE_REPLICATION_TYPE_DEFAULT =

hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/client/TestReplicationConfig.java

@@ -0,0 +1,147 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdds.client;
+
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Test replicationConfig.
+ */
+public class TestReplicationConfig {
+
+  @Test
+  public void deserializeRatis() {
+    final ReplicationConfig replicationConfig = ReplicationConfig
+        .fromTypeAndFactor(ReplicationType.RATIS, ReplicationFactor.THREE);
+
+    Assert
+        .assertEquals(RatisReplicationConfig.class,
+            replicationConfig.getClass());
+
+    RatisReplicationConfig ratisReplicationConfig =
+        (RatisReplicationConfig) replicationConfig;
+    Assert.assertEquals(ReplicationType.RATIS,
+        ratisReplicationConfig.getReplicationType());
+    Assert.assertEquals(ReplicationFactor.THREE,
+        ratisReplicationConfig.getReplicationFactor());
+  }
+
+  @Test
+  public void deserializeStandalone() {
+    final ReplicationConfig replicationConfig = ReplicationConfig
+        .fromTypeAndFactor(ReplicationType.STAND_ALONE, ReplicationFactor.ONE);
+
+    Assert
+        .assertEquals(StandaloneReplicationConfig.class,
+            replicationConfig.getClass());
+
+    StandaloneReplicationConfig standalone =
+        (StandaloneReplicationConfig) replicationConfig;
+    Assert.assertEquals(ReplicationType.STAND_ALONE,
+        standalone.getReplicationType());
+    Assert.assertEquals(ReplicationFactor.ONE,
+        standalone.getReplicationFactor());
+  }
+
+  @Test
+  public void fromJavaObjects() {
+
+    final ReplicationConfig replicationConfig = ReplicationConfig
+        .fromTypeAndFactor(org.apache.hadoop.hdds.client.ReplicationType.RATIS,
+            org.apache.hadoop.hdds.client.ReplicationFactor.THREE);
+
+    Assert.assertEquals(replicationConfig.getReplicationType(),
+        ReplicationType.RATIS);
+    Assert.assertEquals(
+        ((RatisReplicationConfig) replicationConfig).getReplicationFactor(),
+        ReplicationFactor.THREE);
+
+  }
+
+  @Test
+  public void fromTypeAndStringName() {
+
+    ReplicationConfig replicationConfig = null;
+
+    //RATIS-THREE
+    replicationConfig = ReplicationConfig.fromTypeAndString(
+        org.apache.hadoop.hdds.client.ReplicationType.RATIS, "THREE");
+
+    Assert.assertEquals(replicationConfig.getReplicationType(),
+        ReplicationType.RATIS);
+    Assert.assertEquals(
+        ((RatisReplicationConfig) replicationConfig).getReplicationFactor(),
+        ReplicationFactor.THREE);
+
+    //RATIS-ONE
+    replicationConfig = ReplicationConfig.fromTypeAndString(
+        org.apache.hadoop.hdds.client.ReplicationType.RATIS, "ONE");
+
+    Assert.assertEquals(replicationConfig.getReplicationType(),
+        ReplicationType.RATIS);
+    Assert.assertEquals(
+        ((RatisReplicationConfig) replicationConfig).getReplicationFactor(),
+        ReplicationFactor.ONE);
+
+    //STANDALONE-ONE
+    replicationConfig = ReplicationConfig.fromTypeAndString(
+        org.apache.hadoop.hdds.client.ReplicationType.STAND_ALONE, "ONE");
+
+    Assert.assertEquals(replicationConfig.getReplicationType(),
+        ReplicationType.STAND_ALONE);
+    Assert.assertEquals(
+        ((StandaloneReplicationConfig) replicationConfig)
+            .getReplicationFactor(),
+        ReplicationFactor.ONE);
+
+  }
+
+
+  @Test
+  public void fromTypeAndStringInteger() {
+    //RATIS-THREE
+    ReplicationConfig replicationConfig = ReplicationConfig.fromTypeAndString(
+        org.apache.hadoop.hdds.client.ReplicationType.RATIS, "3");
+
+    Assert.assertEquals(replicationConfig.getReplicationType(),
+        ReplicationType.RATIS);
+    Assert.assertEquals(
+        ((RatisReplicationConfig) replicationConfig).getReplicationFactor(),
+        ReplicationFactor.THREE);
+  }
+
+  @Test
+  public void adjustReplication() {
+    ReplicationConfig config =
+        new RatisReplicationConfig(ReplicationFactor.ONE);
+
+    final ReplicationConfig replicationConfig =
+        ReplicationConfig.adjustReplication(config, (short) 1);
+
+    Assert.assertEquals(replicationConfig.getReplicationType(),
+        ReplicationType.RATIS);
+    Assert.assertEquals(
+        ((RatisReplicationConfig) replicationConfig)
+            .getReplicationFactor(),
+        ReplicationFactor.ONE);
+
+  }
+}