From 7f1abf0b27684a1d0abb754a251bc1fad1e38f00 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Thu, 3 Sep 2015 22:48:53 +0900 Subject: [PATCH] HADOOP-10318. Incorrect reference to nodeFile in RumenToSLSConverter error message. Contributed by Wei Yan. (cherry picked from commit 355eaaa33d01f06e9efe960b8888fb925e03ffb9) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 77a6f78c7eb..3e2cdb3c2e5 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -594,6 +594,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom. (Charlie Helin via wang) + HADOOP-10318. Incorrect reference to nodeFile in RumenToSLSConverter + error message. (Wei Yan via ozawa) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java index 63d022b93bd..0d0745c4137 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/RumenToSLSConverter.java @@ -110,7 +110,7 @@ public class RumenToSLSConverter { if (! nodeFile.getParentFile().exists() && ! nodeFile.getParentFile().mkdirs()) { System.err.println("ERROR: Cannot create output directory in path: " - + jsonFile.getParentFile().getAbsoluteFile()); + + nodeFile.getParentFile().getAbsoluteFile()); System.exit(1); }