瀏覽代碼

HDDS-934. Freon run hung on non-functional pipeline.
Contributed by Nanda kumar.

Nanda kumar 6 年之前
父節點
當前提交
ea621fa087
共有 1 個文件被更改,包括 7 次插入10 次删除
  1. 7 10
      hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java

+ 7 - 10
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.
    */