HDFS-13707. [PROVIDED Storage] Fix failing integration tests in ITestProvidedImplementation. Contributed by Virajith Jalaparti.
This commit is contained in:
parent
e4d7227aad
commit
73746c5da7
|
@ -28,6 +28,7 @@ import java.io.OutputStream;
|
|||
import java.io.OutputStreamWriter;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Base64;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.Collections;
|
||||
|
@ -359,7 +360,7 @@ public class TextFileRegionAliasMap
|
|||
}
|
||||
byte[] nonce = new byte[0];
|
||||
if (f.length == 6) {
|
||||
nonce = f[5].getBytes(Charset.forName("UTF-8"));
|
||||
nonce = Base64.getDecoder().decode(f[5]);
|
||||
}
|
||||
return new FileRegion(Long.parseLong(f[0]), new Path(f[1]),
|
||||
Long.parseLong(f[2]), Long.parseLong(f[3]), Long.parseLong(f[4]),
|
||||
|
@ -451,7 +452,7 @@ public class TextFileRegionAliasMap
|
|||
out.append(Long.toString(block.getGenerationStamp()));
|
||||
if (psl.getNonce().length > 0) {
|
||||
out.append(delim)
|
||||
.append(new String(psl.getNonce(), Charset.forName("UTF-8")));
|
||||
.append(Base64.getEncoder().encodeToString(psl.getNonce()));
|
||||
}
|
||||
out.append("\n");
|
||||
}
|
||||
|
|
|
@ -132,7 +132,7 @@ public class ITestProvidedImplementation {
|
|||
nnDirPath.toString());
|
||||
conf.set(DFSConfigKeys.DFS_PROVIDED_ALIASMAP_TEXT_READ_FILE,
|
||||
new Path(nnDirPath, fileNameFromBlockPoolID(bpid)).toString());
|
||||
conf.set(DFSConfigKeys.DFS_PROVIDED_ALIASMAP_TEXT_DELIMITER, ",");
|
||||
conf.set(DFSConfigKeys.DFS_PROVIDED_ALIASMAP_TEXT_DELIMITER, "\t");
|
||||
|
||||
conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR_PROVIDED,
|
||||
new File(providedPath.toUri()).toString());
|
||||
|
|
Loading…
Reference in New Issue