HDFS-13239. Fix non-empty dir warning message when setting default EC policy. Contributed by Bharat Viswanadham.
This commit is contained in:
parent
84c1095586
commit
d6931c30c5
|
@ -358,17 +358,15 @@ public int run(Configuration conf, List<String> args) throws IOException {
|
||||||
try {
|
try {
|
||||||
dfs.setErasureCodingPolicy(p, ecPolicyName);
|
dfs.setErasureCodingPolicy(p, ecPolicyName);
|
||||||
if (ecPolicyName == null){
|
if (ecPolicyName == null){
|
||||||
System.out.println("Set default erasure coding policy" +
|
ecPolicyName = "default";
|
||||||
" on " + path);
|
|
||||||
} else {
|
|
||||||
System.out.println("Set erasure coding policy " + ecPolicyName +
|
|
||||||
" on " + path);
|
|
||||||
}
|
}
|
||||||
|
System.out.println("Set " + ecPolicyName + " erasure coding policy on" +
|
||||||
|
" " + path);
|
||||||
RemoteIterator<FileStatus> dirIt = dfs.listStatusIterator(p);
|
RemoteIterator<FileStatus> dirIt = dfs.listStatusIterator(p);
|
||||||
if (dirIt.hasNext()) {
|
if (dirIt.hasNext()) {
|
||||||
System.out.println("Warning: setting erasure coding policy on a " +
|
System.out.println("Warning: setting erasure coding policy on a " +
|
||||||
"non-empty directory will not automatically convert existing" +
|
"non-empty directory will not automatically convert existing " +
|
||||||
" files to " + ecPolicyName);
|
"files to " + ecPolicyName + " erasure coding policy");
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.err.println(AdminHelper.prettifyException(e));
|
System.err.println(AdminHelper.prettifyException(e));
|
||||||
|
|
|
@ -214,7 +214,7 @@
|
||||||
<comparators>
|
<comparators>
|
||||||
<comparator>
|
<comparator>
|
||||||
<type>SubstringComparator</type>
|
<type>SubstringComparator</type>
|
||||||
<expected-output>Set erasure coding policy RS-6-3-1024k on /ecdir</expected-output>
|
<expected-output>Set RS-6-3-1024k erasure coding policy on /ecdir</expected-output>
|
||||||
</comparator>
|
</comparator>
|
||||||
</comparators>
|
</comparators>
|
||||||
</test>
|
</test>
|
||||||
|
@ -232,7 +232,7 @@
|
||||||
<comparators>
|
<comparators>
|
||||||
<comparator>
|
<comparator>
|
||||||
<type>SubstringComparator</type>
|
<type>SubstringComparator</type>
|
||||||
<expected-output>Set erasure coding policy RS-6-3-1024k on /ecdir</expected-output>
|
<expected-output>Set RS-6-3-1024k erasure coding policy on /ecdir</expected-output>
|
||||||
</comparator>
|
</comparator>
|
||||||
</comparators>
|
</comparators>
|
||||||
</test>
|
</test>
|
||||||
|
@ -311,7 +311,7 @@
|
||||||
<comparators>
|
<comparators>
|
||||||
<comparator>
|
<comparator>
|
||||||
<type>SubstringComparator</type>
|
<type>SubstringComparator</type>
|
||||||
<expected-output>Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to RS-6-3-1024</expected-output>
|
<expected-output>Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to RS-6-3-1024k erasure coding policy</expected-output>
|
||||||
</comparator>
|
</comparator>
|
||||||
</comparators>
|
</comparators>
|
||||||
</test>
|
</test>
|
||||||
|
@ -695,6 +695,28 @@
|
||||||
</comparators>
|
</comparators>
|
||||||
</test>
|
</test>
|
||||||
|
|
||||||
|
<test>
|
||||||
|
<description>setPolicy : set erasure coding policy without given a specific policy name on a non empty directory</description>
|
||||||
|
<test-commands>
|
||||||
|
<command>-fs NAMENODE -mkdir /ecdir</command>
|
||||||
|
<command>-fs NAMENODE -mkdir /ecdir/ecsubdir</command>
|
||||||
|
<ec-admin-command>-fs NAMENODE -setPolicy -path /ecdir</ec-admin-command>
|
||||||
|
</test-commands>
|
||||||
|
<cleanup-commands>
|
||||||
|
<command>-fs NAMENODE -rm -R /ecdir</command>
|
||||||
|
</cleanup-commands>
|
||||||
|
<comparators>
|
||||||
|
<comparator>
|
||||||
|
<type>SubstringComparator</type>
|
||||||
|
<expected-output>Set default erasure coding policy on /ecdir</expected-output>
|
||||||
|
</comparator>
|
||||||
|
<comparator>
|
||||||
|
<type>SubstringComparator</type>
|
||||||
|
<expected-output>Warning: setting erasure coding policy on a non-empty directory will not automatically convert existing files to default erasure coding policy</expected-output>
|
||||||
|
</comparator>
|
||||||
|
</comparators>
|
||||||
|
</test>
|
||||||
|
|
||||||
<test>
|
<test>
|
||||||
<description>getPolicy: get the default policy after setPolicy without given a specific policy name</description>
|
<description>getPolicy: get the default policy after setPolicy without given a specific policy name</description>
|
||||||
<test-commands>
|
<test-commands>
|
||||||
|
|
Loading…
Reference in New Issue