From 5c5b2ed7c7f26b0b26f4216c5c5e83efc535e052 Mon Sep 17 00:00:00 2001
From: Takanobu Asanuma <tasanuma@apache.org>
Date: Wed, 16 Sep 2020 01:36:46 +0900
Subject: [PATCH] HDFS-15576. Erasure Coding: Add rs and rs-legacy codec test
 for addPolicies. Contributed by Fei Hui.

---
 .../hadoop/hdfs/util/TestECPolicyLoader.java  |  8 +++----
 .../test/resources/testErasureCodingConf.xml  |  8 +++++++
 .../src/test/resources/test_ec_policies.xml   | 21 +++++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/util/TestECPolicyLoader.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/util/TestECPolicyLoader.java
index a6adb97dac..55fa56784f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/util/TestECPolicyLoader.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/util/TestECPolicyLoader.java
@@ -52,12 +52,12 @@ public void testLoadECPolicy() throws Exception {
     out.println("<layoutversion>1</layoutversion>");
     out.println("<schemas>");
     out.println("  <schema id=\"RSk12m4\">");
-    out.println("    <codec>RS</codec>");
+    out.println("    <codec>rs</codec>");
     out.println("    <k>12</k>");
     out.println("    <m>4</m>");
     out.println("  </schema>");
     out.println("  <schema id=\"RS-legacyk12m4\">");
-    out.println("    <codec>RS-legacy</codec>");
+    out.println("    <codec>rs-legacy</codec>");
     out.println("    <k>12</k>");
     out.println("    <m>4</m>");
     out.println("  </schema>");
@@ -87,7 +87,7 @@ public void testLoadECPolicy() throws Exception {
     assertEquals(0, schema1.getExtraOptions().size());
     assertEquals(12, schema1.getNumDataUnits());
     assertEquals(4, schema1.getNumParityUnits());
-    assertEquals("RS", schema1.getCodecName());
+    assertEquals("rs", schema1.getCodecName());
 
     ErasureCodingPolicy policy2 = policies.get(1);
     ECSchema schema2 = policy2.getSchema();
@@ -95,7 +95,7 @@ public void testLoadECPolicy() throws Exception {
     assertEquals(0, schema2.getExtraOptions().size());
     assertEquals(12, schema2.getNumDataUnits());
     assertEquals(4, schema2.getNumParityUnits());
-    assertEquals("RS-legacy", schema2.getCodecName());
+    assertEquals("rs-legacy", schema2.getCodecName());
   }
 
   /**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
index 2cc08f4aa5..f527d35ef8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml
@@ -484,6 +484,14 @@
           <type>SubstringComparator</type>
           <expected-output>Add ErasureCodingPolicy XOR-2-1-128k succeed</expected-output>
         </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>Add ErasureCodingPolicy RS-12-4-128k succeed</expected-output>
+        </comparator>
+        <comparator>
+          <type>SubstringComparator</type>
+          <expected-output>Add ErasureCodingPolicy RS-LEGACY-12-4-128k succeed</expected-output>
+        </comparator>
         <comparator>
           <type>SubstringComparator</type>
           <expected-output>Add ErasureCodingPolicy RS-6-3-1024k failed</expected-output>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/test_ec_policies.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/test_ec_policies.xml
index 6d5bb28313..6c5dc070ae 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/test_ec_policies.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/test_ec_policies.xml
@@ -41,7 +41,20 @@
     <m>1</m>
     <options> </options>
   </schema>
+  <schema id="RSk12m4">
+    <codec>rs</codec>
+    <k>12</k>
+    <m>4</m>
+    <options> </options>
+  </schema>
+  <schema id="RS-LEGACYk12m4">
+    <codec>rs-legacy</codec>
+    <k>12</k>
+    <m>4</m>
+    <options> </options>
+  </schema>
   <schema id="RSk6m3">
+    <!-- just for failed test -->
     <codec>RS</codec>
     <k>6</k>
     <m>3</m>
@@ -57,6 +70,14 @@
     <!-- cellsize must be an positive integer multiple of 1024(1k) -->
     <cellsize>131072</cellsize>
   </policy>
+  <policy>
+    <schema>RSk12m4</schema>
+    <cellsize>131072</cellsize>
+  </policy>
+  <policy>
+    <schema>RS-LEGACYk12m4</schema>
+    <cellsize>131072</cellsize>
+  </policy>
   <policy>
     <schema>RSk6m3</schema>
     <cellsize>1048576</cellsize>