You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2017/10/02 18:11:05 UTC
[02/26] hadoop git commit: HADOOP-14902. LoadGenerator#genFile write
close timing is incorrectly calculated. Contributed by Hanisha Koneru
HADOOP-14902. LoadGenerator#genFile write close timing is incorrectly calculated. Contributed by Hanisha Koneru
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/16c62990
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/16c62990
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/16c62990
Branch: refs/heads/HDFS-7240
Commit: 16c6299088edfffe6d0a1c5d72498551256cfe86
Parents: f90381e
Author: Jason Lowe <jl...@apache.org>
Authored: Thu Sep 28 16:38:30 2017 -0500
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Mon Oct 2 11:00:33 2017 -0700
----------------------------------------------------------------------
.../apache/hadoop/fs/loadGenerator/LoadGenerator.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/16c62990/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
index 0bb1b46..b74e75d 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/loadGenerator/LoadGenerator.java
@@ -322,6 +322,7 @@ public class LoadGenerator extends Configured implements Tool {
private void genFile(Path file, long fileSize) throws IOException {
long startTimestamp = Time.monotonicNow();
FSDataOutputStream out = null;
+ boolean isOutClosed = false;
try {
out = fc.create(file,
EnumSet.of(CreateFlag.CREATE, CreateFlag.OVERWRITE),
@@ -337,11 +338,15 @@ public class LoadGenerator extends Configured implements Tool {
i -= s;
}
- startTimestamp = Time.monotonicNow();
- executionTime[WRITE_CLOSE] += (Time.monotonicNow() - startTimestamp);
+ startTime = Time.monotonicNow();
+ out.close();
+ executionTime[WRITE_CLOSE] += (Time.monotonicNow() - startTime);
numOfOps[WRITE_CLOSE]++;
+ isOutClosed = true;
} finally {
- IOUtils.cleanupWithLogger(LOG, out);
+ if (!isOutClosed && out != null) {
+ out.close();
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org