Commit Graph

5682 Commits

Author SHA1 Message Date
Brandon Li c86c303a62 HDFS-5171. Merging change r1535586 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535588 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:52:16 +00:00
Sanford Ryza 81d6bead1e YARN-1335. Move duplicate code from FSSchedulerApp and FiCaSchedulerApp into SchedulerApplication (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535583 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:17:45 +00:00
Jonathan Turner Eagles 076e78d021 HADOOP-10064. Upgrade to maven antrun plugin version 1.7 (Arpit Agarwal via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535267 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 02:40:49 +00:00
Kihwal Lee 82d08eb6d4 svn merge -c 1535188 merging from trunk to branch-2 to fix HDFS-5341.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535190 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 21:31:23 +00:00
Jing Zhao 9a3e05cc6c HDFS-5363. Merge change r1535169 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535183 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 21:04:58 +00:00
Jonathan Turner Eagles 16cc6640b7 HADOOP-9016. HarFsInputStream.skip(long) must never return negative value. (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535088 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 18:12:02 +00:00
Aaron Myers 3e65694f2b HDFS-5403. WebHdfs client cannot communicate with older WebHdfs servers post HDFS-5306. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535057 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 15:20:35 +00:00
Jonathan Turner Eagles d93e30e3a2 HADOOP-9598. Improve code coverage of RMAdminCLI (Aleksey Gorshkov and Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534906 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 04:15:16 +00:00
Bikas Saha 7f27c99a44 Merge r1534884 from trunk to branch-2 YARN-1305. RMHAProtocolService#serviceInit should handle HAUtil's IllegalArgumentException (Tsuyoshi Ozawa via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534887 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 01:16:05 +00:00
Sanford Ryza 6d2ef587d0 YARN-1330. Fair Scheduler: defaultQueueSchedulingPolicy does not take effect (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534862 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 23:58:15 +00:00
Jason Darrell Lowe d480fb0cbb svn commit -c 1534832 FIXES: MAPREDUCE-5561. org.apache.hadoop.mapreduce.v2.app.job.impl.TestJobImpl testcase failing on trunk. Contributed by Karthik Kambatla
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534835 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 22:44:25 +00:00
Jonathan Turner Eagles 2f8b662fc6 YARN-1183. MiniYARNCluster shutdown takes several minutes intermittently (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534806 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 21:37:03 +00:00
Colin McCabe f6aa656ff3 HDFS-5400. DFS_CLIENT_MMAP_CACHE_THREAD_RUNS_PER_TIMEOUT constant is set to the wrong value (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534656 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 15:13:12 +00:00
Sanford Ryza 0d445fe01f YARN-1315. TestQueueACLs should also test FairScheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534510 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 06:33:11 +00:00
Chris Nauroth c534b8f0ba YARN-1331. Merging change r1534499 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534500 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 05:41:33 +00:00
Jonathan Turner Eagles f64cb91d67 HADOOP-9291. enhance unit-test coverage of package o.a.h.metrics2 (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534476 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 03:48:37 +00:00
Tsz-wo Sze a5d967a4dc svn merge -c 1534426 from trunk for HDFS-4885. Improve the verifyBlockPlacement() API in BlockPlacementPolicy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534427 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 00:21:24 +00:00
Brandon Li fcc912838d HDFS-5347. Merging change r1534377 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534379 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:20:35 +00:00
Jing Zhao 7a45ef2300 HDFS-5382. Merge change r1534368 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534374 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:10:57 +00:00
Sanford Ryza 829fc289cf YARN-1288. Make Fair Scheduler ACLs more user friendly (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534316 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 18:46:14 +00:00
Sanford Ryza a822f68858 YARN-1258: Move to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534311 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 18:39:57 +00:00
Uma Maheswara Rao G a2c2913f54 Merge HDFS-5331 make SnapshotDiff.java to a o.a.h.util.Tool interface implementation. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533918 13f79535-47bb-0310-9956-ffa450edef68
2013-10-20 15:34:08 +00:00
Vinod Kumar Vavilapalli 06d24042b6 YARN-1185. Fixed FileSystemRMStateStore to not leave partial files that prevent subsequent ResourceManager recovery. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1533803 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533805 13f79535-47bb-0310-9956-ffa450edef68
2013-10-19 18:15:18 +00:00
Colin McCabe 75968551bd HDFS-5276. FileSystem.Statistics should use thread-local counters to avoid multi-threaded performance issues on read/write. (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533670 13f79535-47bb-0310-9956-ffa450edef68
2013-10-19 00:38:13 +00:00
Jonathan Turner Eagles 3f86a06ec0 MAPREDUCE-5587. TestTextOutputFormat fails on JDK7 (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533630 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 21:03:37 +00:00
Sanford Ryza 5c20de6ac3 MAPREDUCE-5457. Add a KeyOnlyTextOutputReader to enable streaming to write out text files without separators (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533626 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 20:46:05 +00:00
Chris Nauroth 240156ad51 HDFS-5365. Merging change r1533574 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533575 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 18:15:19 +00:00
Jonathan Turner Eagles 875fe36d9e HDFS-4511. Cover package org.apache.hadoop.hdfs.tools with unit test (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533545 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 16:40:09 +00:00
Chris Nauroth 9fa1fca1da HDFS-5365. Merging change r1533283 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533285 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 23:07:15 +00:00
Suresh Srinivas 341272da8b HDFS-5375. Merge 1533258 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533259 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 20:48:39 +00:00
Chris Nauroth 2c1afcf3d0 HADOOP-10055. Merging change r1533188 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533189 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:16:02 +00:00
Chris Nauroth 4723e3e00f HDFS-5336. Merging change r1533183 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533184 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:10:09 +00:00
Jing Zhao 10db2ed897 HDFS-5379. Merge change r1533181 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533182 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:00:03 +00:00
Chris Nauroth 7325bf4a28 HDFS-5375. Merging change r1533165 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533166 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 17:16:05 +00:00
Jing Zhao b2fcad6d36 HDFS-5334. Merge change r1532949 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532950 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 01:36:17 +00:00
Andrew Wang 5776b0b324 HDFS-5360. Improvement of usage message of renameSnapshot and deleteSnapshot. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532938 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:16:13 +00:00
Tsz-wo Sze 0b18a51c33 svn merge -c 1532932 from trunk for HDFS-4376. Fix race conditions in Balancer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532933 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:06:46 +00:00
Jonathan Turner Eagles 186581fef2 HADOOP-9078. enhance unit-test coverage of class org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532929 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:47:16 +00:00
Kihwal Lee 0c4da3693a svn merge -c 1532915 Merging from trunk to branch-2 to fix HDFS-5346.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532916 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:15:47 +00:00
Suresh Srinivas bc18c6f842 HADOOP-10005. Merge 1532907 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532908 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:05:23 +00:00
Suresh Srinivas 17b20d742d HDFS-5370. Merge 1532899 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532902 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:47:31 +00:00
Jonathan Turner Eagles f35f88b1cf MAPREDUCE-5586. TestCopyMapper#testCopyFailOnBlockSizeDifference fails when run from hadoop-tools/hadoop-distcp directory (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532890 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:28:13 +00:00
Chris Nauroth 9cda28ef0d HADOOP-9897. Merging change r1532880 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532883 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:15:09 +00:00
Jonathan Turner Eagles 85b5e96f10 MAPREDUCE-5585. TestCopyCommitter#testNoCommitAction Fails on JDK7 (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532878 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:06:53 +00:00
Tsz-wo Sze 71b1436bcc svn merge -c 1532860 from trunk for adding TestOpenFilesWithSnapshot.java for HDFS-5283.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532861 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:47:42 +00:00
Tsz-wo Sze b2e641e31f svn merge -c 1532857 from trunk for HDFS-5283. Under construction blocks only inside snapshots should not be counted in safemode threshhold.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532858 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:39:24 +00:00
Jing Zhao 9590b4b93d HDFS-5130. Merge change r1532580 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532581 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 22:50:44 +00:00
Brandon Li 218b1cc69c HDFS-5330. Merging change r1532539 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532543 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 21:30:18 +00:00
Sanford Ryza 3b0a6e6edd YARN-1295. In UnixLocalWrapperScriptBuilder, using bash -c can cause Text file busy errors. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532533 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 21:15:38 +00:00
Andrew Wang ea64a5a48d HADOOP-100046. Print a log message when SSL is enabled (David S. Wang via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532479 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 18:40:45 +00:00