Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-15109. TestDFSIO -read -random doesn't work on file sized 4GB. Contributed by Ajay Kumar.

This commit is contained in:
Chen Liang 2017-12-18 13:25:47 -08:00
parent 811fabdebe
commit c7a4dda3c5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java
View File

@ -31,8 +31,8 @@ import java.io.PrintStream;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.Random;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hdfs.DistributedFileSystem;
@ -582,7 +582,7 @@ public class TestDFSIO implements Tool {
* 3) Skip-read skips skipSize bytes after every read : skipSize > 0 * 3) Skip-read skips skipSize bytes after every read : skipSize > 0
*/ */
public static class RandomReadMapper extends IOStatMapper { public static class RandomReadMapper extends IOStatMapper {
private Random rnd; private ThreadLocalRandom rnd;
private long fileSize; private long fileSize;
private long skipSize; private long skipSize;
@ -593,7 +593,7 @@ public class TestDFSIO implements Tool {
} }
public RandomReadMapper() { public RandomReadMapper() {
rnd = new Random(); rnd = ThreadLocalRandom.current();
} }
@Override // IOMapperBase @Override // IOMapperBase
@ -635,8 +635,8 @@ public class TestDFSIO implements Tool {
* @return * @return
*/ */
private long nextOffset(long current) { private long nextOffset(long current) {
if(skipSize == 0) if (skipSize == 0)
return rnd.nextInt((int)(fileSize)); return rnd.nextLong(fileSize);
if(skipSize > 0) if(skipSize > 0)
return (current < 0) ? 0 : (current + bufferSize + skipSize); return (current < 0) ? 0 : (current + bufferSize + skipSize);
// skipSize < 0 // skipSize < 0