MAPREDUCE-6729. Accurately compute the test execute time in DFSIO. Contributed by mingleizhang.
This closes #112 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ce93595d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ce93595d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ce93595d Branch: refs/heads/HADOOP-12756 Commit: ce93595d7a18bd0561ae2c1983b51f6aba887179 Parents: 8d32bd8 Author: Akira Ajisaka <aajis...@apache.org> Authored: Sat Jul 30 22:13:19 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Sat Jul 30 22:13:19 2016 +0900 ---------------------------------------------------------------------- .../java/org/apache/hadoop/fs/TestDFSIO.java | 54 ++++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce93595d/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java index 2639f8b..e7aa66b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java @@ -228,57 +228,45 @@ public class TestDFSIO implements Tool { public static void testWrite() throws Exception { FileSystem fs = cluster.getFileSystem(); - long tStart = System.currentTimeMillis(); - bench.writeTest(fs); - long execTime = System.currentTimeMillis() - tStart; + long execTime = bench.writeTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_WRITE, execTime); } @Test (timeout = 10000) public void testRead() throws Exception { FileSystem fs = cluster.getFileSystem(); - long tStart = System.currentTimeMillis(); - bench.readTest(fs); - long execTime = System.currentTimeMillis() - tStart; + long execTime = bench.readTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_READ, execTime); } @Test (timeout = 10000) public void testReadRandom() throws Exception { FileSystem fs = cluster.getFileSystem(); - long tStart = System.currentTimeMillis(); bench.getConf().setLong("test.io.skip.size", 0); - bench.randomReadTest(fs); - long execTime = System.currentTimeMillis() - tStart; + long execTime = bench.randomReadTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_READ_RANDOM, execTime); } @Test (timeout = 10000) public void testReadBackward() throws Exception { FileSystem fs = cluster.getFileSystem(); - long tStart = System.currentTimeMillis(); bench.getConf().setLong("test.io.skip.size", -DEFAULT_BUFFER_SIZE); - bench.randomReadTest(fs); - long execTime = System.currentTimeMillis() - tStart; + long execTime = bench.randomReadTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_READ_BACKWARD, execTime); } @Test (timeout = 10000) public void testReadSkip() throws Exception { FileSystem fs = cluster.getFileSystem(); - long tStart = System.currentTimeMillis(); bench.getConf().setLong("test.io.skip.size", 1); - bench.randomReadTest(fs); - long execTime = System.currentTimeMillis() - tStart; + long execTime = bench.randomReadTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_READ_SKIP, execTime); } @Test (timeout = 10000) public void testAppend() throws Exception { FileSystem fs = cluster.getFileSystem(); - long tStart = System.currentTimeMillis(); - bench.appendTest(fs); - long execTime = System.currentTimeMillis() - tStart; + long execTime = bench.appendTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_APPEND, execTime); } @@ -286,9 +274,7 @@ public class TestDFSIO implements Tool { public void testTruncate() throws Exception { FileSystem fs = cluster.getFileSystem(); bench.createControlFile(fs, DEFAULT_NR_BYTES / 2, DEFAULT_NR_FILES); - long tStart = System.currentTimeMillis(); - bench.truncateTest(fs); - long execTime = System.currentTimeMillis() - tStart; + long execTime = bench.truncateTest(fs); bench.analyzeResult(fs, TestType.TEST_TYPE_TRUNCATE, execTime); } @@ -430,12 +416,14 @@ public class TestDFSIO implements Tool { } } - private void writeTest(FileSystem fs) throws IOException { + private long writeTest(FileSystem fs) throws IOException { Path writeDir = getWriteDir(config); fs.delete(getDataDir(config), true); fs.delete(writeDir, true); - + long tStart = System.currentTimeMillis(); runIOTest(WriteMapper.class, writeDir); + long execTime = System.currentTimeMillis() - tStart; + return execTime; } private void runIOTest( @@ -496,10 +484,13 @@ public class TestDFSIO implements Tool { } } - private void appendTest(FileSystem fs) throws IOException { + private long appendTest(FileSystem fs) throws IOException { Path appendDir = getAppendDir(config); fs.delete(appendDir, true); + long tStart = System.currentTimeMillis(); runIOTest(AppendMapper.class, appendDir); + long execTime = System.currentTimeMillis() - tStart; + return execTime; } /** @@ -539,10 +530,13 @@ public class TestDFSIO implements Tool { } } - private void readTest(FileSystem fs) throws IOException { + private long readTest(FileSystem fs) throws IOException { Path readDir = getReadDir(config); fs.delete(readDir, true); + long tStart = System.currentTimeMillis(); runIOTest(ReadMapper.class, readDir); + long execTime = System.currentTimeMillis() - tStart; + return execTime; } /** @@ -620,10 +614,13 @@ public class TestDFSIO implements Tool { } } - private void randomReadTest(FileSystem fs) throws IOException { + private long randomReadTest(FileSystem fs) throws IOException { Path readDir = getRandomReadDir(config); fs.delete(readDir, true); + long tStart = System.currentTimeMillis(); runIOTest(RandomReadMapper.class, readDir); + long execTime = System.currentTimeMillis() - tStart; + return execTime; } /** @@ -665,10 +662,13 @@ public class TestDFSIO implements Tool { } } - private void truncateTest(FileSystem fs) throws IOException { + private long truncateTest(FileSystem fs) throws IOException { Path TruncateDir = getTruncateDir(config); fs.delete(TruncateDir, true); + long tStart = System.currentTimeMillis(); runIOTest(TruncateMapper.class, TruncateDir); + long execTime = System.currentTimeMillis() - tStart; + return execTime; } private void sequentialTest(FileSystem fs, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
