HDDS-934. Freon run hung on non-functional pipeline. Contributed by Nanda kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea621fa0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea621fa0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea621fa0 Branch: refs/heads/HDFS-12943 Commit: ea621fa0877441ec5d9488702d455616e4df49ba Parents: 2af90cc Author: Nanda kumar <[email protected]> Authored: Thu Dec 20 11:10:08 2018 +0530 Committer: Nanda kumar <[email protected]> Committed: Thu Dec 20 11:13:15 2018 +0530 ---------------------------------------------------------------------- .../hadoop/ozone/freon/RandomKeyGenerator.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea621fa0/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java index d85b829..5871b49 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java @@ -270,23 +270,20 @@ public final class RandomKeyGenerator implements Callable<Void> { processor.shutdown(); processor.awaitTermination(Integer.MAX_VALUE, TimeUnit.MILLISECONDS); completed = true; - progressbar.shutdown(); - if (validateWrites) { + if (exception) { + progressbar.terminate(); + } else { + progressbar.shutdown(); + } + + if (validator != null) { validator.join(); } ozoneClient.close(); return null; } - private void parseOptions(CommandLine cmdLine) { - if (keySize < 1024) { - throw new IllegalArgumentException( - "keySize can not be less than 1024 bytes"); - } - - } - /** * Adds ShutdownHook to print statistics. */ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
