MAPREDUCE-6905. HADOOP_JOB_HISTORY_OPTS should be HADOOP_JOB_HISTORYSERVER_OPTS in mapred-config.sh. Contributed by LiXin Ge.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bf1f5993 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bf1f5993 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bf1f5993 Branch: refs/heads/YARN-5734 Commit: bf1f59937dd5d860c9ed7fefce203d6a9f645182 Parents: fa1aaee Author: Naganarasimha <naganarasimha...@apache.org> Authored: Sun Jul 2 15:56:27 2017 +0530 Committer: Naganarasimha <naganarasimha...@apache.org> Committed: Sun Jul 2 15:56:27 2017 +0530 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/fs/TestDFSIO.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf1f5993/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java index 34eac83..12fbdad 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java @@ -294,8 +294,17 @@ public class TestDFSIO implements Tool { int nrFiles ) throws IOException { LOG.info("creating control file: "+nrBytes+" bytes, "+nrFiles+" files"); - + final int maxDirItems = config.getInt( + DFSConfigKeys.DFS_NAMENODE_MAX_DIRECTORY_ITEMS_KEY, + DFSConfigKeys.DFS_NAMENODE_MAX_DIRECTORY_ITEMS_DEFAULT); Path controlDir = getControlDir(config); + + if (nrFiles > maxDirItems) { + final String message = "The directory item limit of " + controlDir + + " is exceeded: limit=" + maxDirItems + " items=" + nrFiles; + throw new IOException(message); + } + fs.delete(controlDir, true); for(int i=0; i < nrFiles; i++) { @@ -310,8 +319,9 @@ public class TestDFSIO implements Tool { } catch(Exception e) { throw new IOException(e.getLocalizedMessage()); } finally { - if (writer != null) + if (writer != null) { writer.close(); + } writer = null; } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org