Commit Graph

4624 Commits

Author SHA1 Message Date
Chris Nauroth e9fff0bbba YARN-894. Merging change r1501016 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501020 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 23:44:30 +00:00
Alejandro Abdelnur dc18424723 HDFS-4841. FsShell commands using secure webhfds fail ClientFinalizer shutdown hook. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501006 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 23:11:03 +00:00
Vinod Kumar Vavilapalli 16841d50c5 YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1500994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500995 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 22:33:43 +00:00
Chris Nauroth fd159ded9b MAPREDUCE-5187. Merging change r1500929 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500930 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 20:28:55 +00:00
Chris Nauroth 2a448cc5e7 MAPREDUCE-5366. Merging change r1500842 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500848 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 17:17:07 +00:00
Chris Nauroth 81bfd0316e MAPREDUCE-5360. Merging change r1500194 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500195 13f79535-47bb-0310-9956-ffa450edef68
2013-07-06 03:42:43 +00:00
Konstantin Boudnik e9b658b021 HDFS-4860. Add additional attributes to JMX beans. Contributed by Trevor Lorimer
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500140 13f79535-47bb-0310-9956-ffa450edef68
2013-07-05 21:40:46 +00:00
Bikas Saha c478992e4c Merge r1499886 from trunk to branch-2. YARN-845. RM crash with NPE on NODE_UPDATE (bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499888 13f79535-47bb-0310-9956-ffa450edef68
2013-07-04 23:38:29 +00:00
Aaron Myers 0886f841c5 HDFS-4465. Optimize datanode ReplicasMap and ReplicaInfo. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499660 13f79535-47bb-0310-9956-ffa450edef68
2013-07-04 05:56:41 +00:00
Colin McCabe dbfa01ff96 HADOOP-9416. Add new symlink resolution methods in FileSystem and FileSystemLinkResolver. (awang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499604 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 23:31:38 +00:00
Brandon Li d49a541d8a Move HDFS-4948 and HDFS-4762 to the right section in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499494 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 17:33:41 +00:00
Jason Darrell Lowe afeff43d7a svn merge -c 1499425 FIXES: MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl. Contributed by Devaraj K
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499426 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 14:46:54 +00:00
Tsz-wo Sze 4bcf0eb51a HDFS-4954. In nfs, OpenFileCtx.getFlushedOffset() should handle IOException. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499321 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 11:16:15 +00:00
Tsz-wo Sze 9c097d8817 Add .classpath, .project and .settings to svn:ignore.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499319 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 10:58:47 +00:00
Brandon Li c8befb6c69 Fix build version for nfs projects in branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499224 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 06:36:58 +00:00
Chris Nauroth 8c10908e1e MAPREDUCE-5357. Merging change r1499210 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499217 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 05:37:34 +00:00
Brandon Li 07a08e2941 HDFS-4762,HDFS-4948. Merging change r1499029,r1499041,r1499152 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499190 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 03:55:42 +00:00
Brandon Li b1d5f9519c HADOOP-9515. Merging change r1493924 and r1493929 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499167 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 00:46:54 +00:00
Brandon Li b0acd23d92 HADOOP-9509. Merging change r1490845 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499156 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 00:05:40 +00:00
Chris Nauroth 0f3bb0567d MAPREDUCE-5359. Merging change r1499153 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499154 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 00:01:28 +00:00
Chris Nauroth 6c703d6ef0 MAPREDUCE-5355. Merging change r1499148 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499149 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 23:32:41 +00:00
Enis Soztutar 6384d35ab8 HADOOP-9660 Merge change 1499132 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499142 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 22:54:47 +00:00
Jason Darrell Lowe 199485bcdf svn merge -c 1499125 FIXES: MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the input path dir. Contributed by Devaraj K
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499127 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 22:00:43 +00:00
Chris Nauroth 65bbb30101 HADOOP-9681. Merging change r1499069 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499070 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 19:27:16 +00:00
Tsz-wo Sze b189d3a968 svn merge -c 1498962 from trunk for HDFS-4943. WebHdfsFileSystem does not work when original file path has encoded chars.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498963 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 14:59:55 +00:00
Chris Nauroth 2f0d853fd6 HADOOP-9678. Merging change r1498786 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498787 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 05:38:22 +00:00
Colin McCabe dd25abb825 HADOOP-9676. Make maximum RPC buffer size configurable (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498740 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 23:29:03 +00:00
Colin McCabe 3121145b9a HADOOP-9414. Refactor out FSLinkResolver and relevant helper methods.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498728 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 22:35:11 +00:00
Kihwal Lee 5683f04907 svn merge -c 1498665 Merging from trunk to branch-2 to fix HDFS-4888.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498672 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 20:32:36 +00:00
Thomas Graves 9520013838 Preparing for 0.23.9 release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498478 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 14:27:48 +00:00
Tsz-wo Sze 797a30b5b7 svn merge -c 1498202 from trunk for HDFS-4797. BlockScanInfo does not override equals(..) and hashCode() consistently.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498203 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 01:29:28 +00:00
Chris Nauroth 5808ba30dd MAPREDUCE-5349. TestClusterMapReduceTestCase and TestJobName fail on Windows in branch-2. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498144 13f79535-47bb-0310-9956-ffa450edef68
2013-06-30 15:53:29 +00:00
Chris Nauroth c141d292c3 HDFS-4944. Merging change r1498055 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498057 13f79535-47bb-0310-9956-ffa450edef68
2013-06-30 03:49:22 +00:00
Luke Lu 8a93677f93 YARN-877. Support resource blacklisting for FifoScheduler. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498024 13f79535-47bb-0310-9956-ffa450edef68
2013-06-29 20:22:19 +00:00
Luke Lu 805fa42025 LF normalization according to HADOOP-8912
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498023 13f79535-47bb-0310-9956-ffa450edef68
2013-06-29 20:20:59 +00:00
Arun Murthy 448d56ad31 Merge -c 1497922 from trunk to branch-2 to fix HADOOP-9665. Fixed BlockDecompressorStream#decompress to return -1 rather than throw EOF at end of file. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497923 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 21:07:12 +00:00
Alejandro Abdelnur 1731028a94 YARN-883. Expose Fair Scheduler-specific queue metrics. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497885 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:01:48 +00:00
Alejandro Abdelnur 5d45387c00 MAPREDUCE-5333. Add test that verifies MRAM works correctly when sending requests with non-normalized capabilities. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497881 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 18:55:31 +00:00
Colin McCabe 7edc5f5456 HADOOP-9673. NetworkTopology: When a node cannot be added, print out its location for diagnostic purposes
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497180 13f79535-47bb-0310-9956-ffa450edef68
2013-06-27 01:40:05 +00:00
Chris Nauroth b7e4aae320 HDFS-4932. Merging change r1497141 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497143 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 22:24:52 +00:00
Arun Murthy cb74ad6ba0 Release notes for hadoop-2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496798 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 07:20:55 +00:00
Arun Murthy de82f25604 Preparing for hadoop-2.1.0-beta release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496790 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 06:51:07 +00:00
Arun Murthy 9efe263b78 Merge -c 1496751 from trunk to branch-2 to fix YARN-869. Move ResourceManagerAdministrationProtocol out of main YARN api. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496754 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 06:03:24 +00:00
Arun Murthy 2977cbfc83 Merge -c 1496741 from trunk to branch-2 to fix MAPREDUCE-5326. Added version to shuffle header. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496742 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 05:50:23 +00:00
Vinod Kumar Vavilapalli a7f7d5b440 YARN-874. Making common RPC to switch to not switch to simple when other mechanisms are enabled and thus fix YARN/MR test failures after HADOOP-9421. Contributed by Daryn Sharp and Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1496692 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496693 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 00:43:05 +00:00
Colin McCabe 7880da2743 HADOOP-9355. Abstract Symlink tests to use either FileContext or FileSystem (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496691 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 00:36:01 +00:00
Chris Nauroth bc4c8b12a6 HADOOP-9656. Merging change r1496597 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496600 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 19:26:48 +00:00
Chris Nauroth 837288af56 HDFS-4927. Merging change r1496350 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496351 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 05:11:29 +00:00
Colin McCabe ba014fe64b HADOOP-9355. Abstract symlink tests to use either FileContext or FileSystem. (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496306 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 00:28:34 +00:00
Alejandro Abdelnur 4d5bf5f130 HADOOP-9661. Allow metrics sources to be extended. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496228 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 21:43:01 +00:00