Commit Graph

4261 Commits

Author SHA1 Message Date
Alejandro Abdelnur ab4b602ca6 YARN-392. Make it possible to specify hard locality constraints in resource requests. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488328 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 17:28:10 +00:00
Christopher Douglas 1711348e48 MAPREDUCE-5176. Add annotation for tagging tasks as responsive to
preemption. Contributed by Carlo Curino, cdouglas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488105 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 06:07:37 +00:00
Tsz-wo Sze 360fa0c6f5 svn merge -c 1487942 from trunk for HDFS-4848. copyFromLocal and renaming a file to ".snapshot" should output hat ".snapshot" is a reserved name.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488097 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:16:05 +00:00
Tsz-wo Sze 6428612f35 svn merge -c 1487698 from trunk for HDFS-4863. The root directory should be added to the snapshottable directory list while loading fsimage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488096 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:13:32 +00:00
Tsz-wo Sze 74fa2f1de8 svn merge -c 1487655 from trunk for HDFS-4857. Snapshot.Root and AbstractINodeDiff#snapshotINode should not be put into INodeMap when loading FSImage.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488094 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:10:06 +00:00
Tsz-wo Sze 387b7af02f svn merge -c 1487647 from trunk for HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid arguments.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488093 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:07:52 +00:00
Tsz-wo Sze ab2588a78b svn merge -c 1487643 from trunk for HDFS-4842. Identify the correct prior snapshot when deleting a snapshot under a renamed subtree.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488091 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 05:03:27 +00:00
Tsz-wo Sze 1b594395da svn merge -c 1483150 from trunk for HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log flushes when running on virtualized disk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488090 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:50:10 +00:00
Tsz-wo Sze 82f91de0b6 Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488089 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:29:20 +00:00
Siddharth Seth 36ef457902 merge MAPREDUCE-5286 from trunk. Change MapReduce to use ContainerTokenIdentifier instead of the entire Container in the startContainer call - YARN-684. Contributed by Vinod Kumar Vavilapalli.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488088 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:18:50 +00:00
Siddharth Seth e6a9c87a11 YARN-684. ContainerManager.startContainer should use ContainerTokenIdentifier instead of the entire Container. Contributed by Vinod Kumar Vavilapalli.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488086 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:14:27 +00:00
Sanjay Radia 5f96f3a0c3 Merged HADOOP-7391 svn merge -c 1488069
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488071 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 00:54:05 +00:00
Vinod Kumar Vavilapalli 1a8872e1e0 MAPREDUCE-5228. Bring back FileInputFormat.Counter and FileOuputFormat.Counter for binary compatibility with 1.x mapred APIs. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1488060 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488061 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 23:54:06 +00:00
Vinod Kumar Vavilapalli d95c5a23d9 MAPREDUCE-5261. Reverting the patch as it is no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488033 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 21:54:28 +00:00
Vinod Kumar Vavilapalli a099537780 YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth.
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1487994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 20:19:53 +00:00
Konstantin Boudnik d1d9252059 HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487982 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 19:14:26 +00:00
Konstantin Boudnik baff3aadac HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487981 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 19:13:12 +00:00
Siddharth Seth 0fb465cbc4 merge YARN-719 from trunk. Move RMIdentifier from Container to ContainerTokenIdentifier. Contributed by Vinod Kumar Vavilapalli.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487746 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 05:01:40 +00:00
Vinod Kumar Vavilapalli f1a216b603 HADOOP-9574. Fix for timing issues in the original patch's test-case.
svn merge --ignore-ancestry -c 1487722 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487723 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 04:22:48 +00:00
Vinod Kumar Vavilapalli dfa5f198f0 YARN-638. Modified ResourceManager to restore RMDelegationTokens after restarting. Contributed by Jian He.
svn merge --ignore-ancestry -c 1487720 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487721 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 04:15:05 +00:00
Vinod Kumar Vavilapalli dbd1fbb616 YARN-714. Added NMTokens to be sent to AMs as part of heart-beat response. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1487704 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487705 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 01:57:39 +00:00
Vinod Kumar Vavilapalli 6cb1cf3d1a MAPREDUCE-5263. Bring back old methods and fields in filecache.DistributedCache for binary compatibility with mapred in 1.x. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1487695 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487696 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 01:24:15 +00:00
Vinod Kumar Vavilapalli 2d8508120d HADOOP-9574. Added new methods in AbstractDelegationTokenSecretManager for helping YARN ResourceManager to reuse code for RM restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1487692 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487693 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 00:53:24 +00:00
Vinod Kumar Vavilapalli cfdb09b7cb YARN-578. Fixed NM to use SecureIOUtils for reading and aggregating logs. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1487672 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487686 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 00:01:04 +00:00
Alejandro Abdelnur 8bb534f423 HDFS-4865. Remove sub resource warning from httpfs log at startup time. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487619 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 19:55:32 +00:00
Jason Darrell Lowe c4c2f45c6c svn merge -c 1487498 FIXES: YARN-512. Log aggregation root directory check is more expensive than it needs to be. Contributed by Maysam Yabandeh
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487500 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 14:29:38 +00:00
Vinod Kumar Vavilapalli 604fe963fd YARN-422. Add a NM Client library to help application-writers. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1487184 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487187 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 01:43:01 +00:00
Vinod Kumar Vavilapalli 71cc411340 MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into 2.x so as to be compatible with 1.x. Contributed by Zhijie Shen.
Incompatible as ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so breaks 0.23.x but it shouldn't be a big deal in reality.
svn merge --ignore-ancestry -c 1487175 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 00:43:47 +00:00
Vinod Kumar Vavilapalli a2303831b4 MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He.
svn merge --ignore-ancestry -c 1486271 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487158 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 22:38:14 +00:00
Jason Darrell Lowe ea60ea3b85 svn merge -c 1456212 FIXES: HADOOP-9397. Incremental dist tar build fails. Contributed by Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487117 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 20:58:39 +00:00
Devaraj Das 0c221b3b03 Merge -r 1487092:1487093 from trunk onto branch-2. Fixes HDFS-4827.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487099 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 20:25:35 +00:00
Kihwal Lee 419fb4a4de svn merge -c 1486974 Merging from trunk to branch-2 to fix HDFS-4780.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486975 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 15:49:33 +00:00
Suresh Srinivas dbe14af299 HDFS-4825. Merge change 1486386 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486387 13f79535-47bb-0310-9956-ffa450edef68
2013-05-26 02:28:10 +00:00
Suresh Srinivas fa88e4ea6e HADOOP-8562. CHANGES.txt cleanup related to merging the related jiras to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486384 13f79535-47bb-0310-9956-ffa450edef68
2013-05-26 00:09:12 +00:00
Konstantin Boudnik b8535c0ec1 Updating common and mapreduce CHANGES.txt with 2.0.4.1-alpha release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486270 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 01:43:46 +00:00
Vinod Kumar Vavilapalli 6c5055fe92 YARN-571. Remove user from ContainerLaunchContext. Contributed by Omkar Vinit Joshi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486251 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 23:11:25 +00:00
Suresh Srinivas 599b00e087 MAPREDUCE-5191. Merge r1484575 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486245 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:47:19 +00:00
Suresh Srinivas 5f496310b6 HADOOP-8562. Merge r1480883 for HADOOP-9553, r1480880 for HADOOP-9556, r1478633, r1478592 for HADOOP-9483, r1478577 for HADOOP-9043
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486244 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:36:52 +00:00
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:29:49 +00:00
Suresh Srinivas baa2db4c64 HADOOP-8562. Merge r1477376 for HADOOP-9413, r1476877 for HDFS-4734, r1476856 for HADOOP-9524.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486238 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:20:55 +00:00
Suresh Srinivas f0829a44e4 HADOOP-8562. Merge r1469667 for YARN-493 and HADOOP-9486 and r1469996 for HADOOP-9488.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486231 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 21:58:04 +00:00
Suresh Srinivas 1e119f5c31 HDFS-4705. Merge r1476610 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486199 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:54:00 +00:00
Suresh Srinivas e0c878b493 HADOOP-9490. Merge r1476609 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486179 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:24:25 +00:00
Suresh Srinivas fe81cd68c8 HADOOP-9500. Merge r1476606 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486177 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:19:46 +00:00
Suresh Srinivas f05a2e5b69 HDFS-4722. Merge r1476597 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:16:58 +00:00
Suresh Srinivas c0fbc823f0 HDFS-4740. Merge r1476596 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486174 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:14:04 +00:00
Suresh Srinivas bc0eb9d993 HDFS-4743. Merge r1476591 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486162 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:45:39 +00:00
Suresh Srinivas 3694a73ff8 HADOOP-9290. Merge r1476586 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:37:58 +00:00
Suresh Srinivas 0610d2d2d3 HDFS-4741. Merge r1476585 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486151 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:29:50 +00:00
Suresh Srinivas 0af2735024 HDFS-3131. Merge r1305688 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486150 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:26:33 +00:00