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

HDDS-1534. freon should return non-zero exit code on failure. Contributed by Nilotpal Nandi.

This commit is contained in:
Mukul Kumar Singh 2019-05-28 07:52:56 +05:30
parent b70d1be685
commit 72dd79015a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/RandomKeyGenerator.java
View File

@ -107,7 +107,7 @@ public final class RandomKeyGenerator implements Callable<Void> {
LoggerFactory.getLogger(RandomKeyGenerator.class); LoggerFactory.getLogger(RandomKeyGenerator.class);
private boolean completed = false; private boolean completed = false;
private boolean exception = false; private Exception exception = null;
@Option(names = "--numOfThreads", @Option(names = "--numOfThreads",
description = "number of threads to be launched for the run", description = "number of threads to be launched for the run",
@ -278,7 +278,7 @@ public final class RandomKeyGenerator implements Callable<Void> {
processor.awaitTermination(Integer.MAX_VALUE, TimeUnit.MILLISECONDS); processor.awaitTermination(Integer.MAX_VALUE, TimeUnit.MILLISECONDS);
completed = true; completed = true;
if (exception) { if (exception != null) {
progressbar.terminate(); progressbar.terminate();
} else { } else {
progressbar.shutdown(); progressbar.shutdown();
@ -288,6 +288,9 @@ public final class RandomKeyGenerator implements Callable<Void> {
validator.join(); validator.join();
} }
ozoneClient.close(); ozoneClient.close();
if (exception != null) {
throw exception;
}
return null; return null;
} }
@ -337,7 +340,7 @@ public final class RandomKeyGenerator implements Callable<Void> {
out.println(); out.println();
out.println("***************************************************"); out.println("***************************************************");
out.println("Status: " + (exception ? "Failed" : "Success")); out.println("Status: " + (exception != null ? "Failed" : "Success"));
out.println("Git Base Revision: " + VersionInfo.getRevision()); out.println("Git Base Revision: " + VersionInfo.getRevision());
out.println("Number of Volumes created: " + numberOfVolumesCreated); out.println("Number of Volumes created: " + numberOfVolumesCreated);
out.println("Number of Buckets created: " + numberOfBucketsCreated); out.println("Number of Buckets created: " + numberOfBucketsCreated);
@ -577,7 +580,7 @@ public final class RandomKeyGenerator implements Callable<Void> {
numberOfVolumesCreated.getAndIncrement(); numberOfVolumesCreated.getAndIncrement();
volume = objectStore.getVolume(volumeName); volume = objectStore.getVolume(volumeName);
} catch (IOException e) { } catch (IOException e) {
exception = true; exception = e;
LOG.error("Could not create volume", e); LOG.error("Could not create volume", e);
return; return;
} }
@ -644,13 +647,13 @@ public final class RandomKeyGenerator implements Callable<Void> {
} }
} }
} catch (Exception e) { } catch (Exception e) {
exception = true; exception = e;
LOG.error("Exception while adding key: {} in bucket: {}" + LOG.error("Exception while adding key: {} in bucket: {}" +
" of volume: {}.", key, bucket, volume, e); " of volume: {}.", key, bucket, volume, e);
} }
} }
} catch (Exception e) { } catch (Exception e) {
exception = true; exception = e;
LOG.error("Exception while creating bucket: {}" + LOG.error("Exception while creating bucket: {}" +
" in volume: {}.", bucketName, volume, e); " in volume: {}.", bucketName, volume, e);
} }
@ -696,7 +699,7 @@ public final class RandomKeyGenerator implements Callable<Void> {
private String[] tenQuantileKeyWriteTime; private String[] tenQuantileKeyWriteTime;
private FreonJobInfo() { private FreonJobInfo() {
this.status = exception ? "Failed" : "Success"; this.status = exception != null ? "Failed" : "Success";
this.numOfVolumes = RandomKeyGenerator.this.numOfVolumes; this.numOfVolumes = RandomKeyGenerator.this.numOfVolumes;
this.numOfBuckets = RandomKeyGenerator.this.numOfBuckets; this.numOfBuckets = RandomKeyGenerator.this.numOfBuckets;
this.numOfKeys = RandomKeyGenerator.this.numOfKeys; this.numOfKeys = RandomKeyGenerator.this.numOfKeys;