Commit Graph

4560 Commits

Author SHA1 Message Date
Suresh Srinivas ecf57540da HDFS-4903. Merge 1503570 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503572 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 06:49:05 +00:00
Vinod Kumar Vavilapalli f4f14c079e YARN-523. Modified a test-case to validate container diagnostics on localization failures. Contributed by Jian He.
svn merge --ignore-ancestry -c 1503532 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503533 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 01:04:10 +00:00
Bikas Saha 644b6a54ad Merge r1503526 from trunk to branch-2 for YARN-521. Augment AM - RM client module to be able to request containers only at specific locations (Sandy Ryza via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503527 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 00:28:29 +00:00
Jason Darrell Lowe 293d42edf0 svn merge -c 1503499 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503505 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 22:30:39 +00:00
Kihwal Lee 7a4bd44dc9 svn merge -c 1503390 merging from trunk to fix HADOOP-9707.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503394 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 18:17:35 +00:00
Chris Nauroth 4f7b540d14 YARN-909. Merging change r1503357 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503362 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 17:36:16 +00:00
Bikas Saha dc8ad1213b Merge r1503353 from trunk to branch-2 for YARN-654. AMRMClient: Perform sanity checks for parameters of public methods (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503354 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 17:18:47 +00:00
Harsh J 5699dbc35f HADOOP-9241. DU refresh interval is not configurable. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502955 13f79535-47bb-0310-9956-ffa450edef68
2013-07-14 11:01:02 +00:00
Bikas Saha 469e65c3aa Merge r1502914 from trunk to branch-2 for YARN-763. AMRMClientAsync should stop heartbeating after receiving shutdown from RM (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502916 13f79535-47bb-0310-9956-ffa450edef68
2013-07-13 23:38:27 +00:00
Bikas Saha c1b0106711 Merge r1502906 from trunk to branch-2 for YARN-541. getAllocatedContainers() is not returning all the allocated containers (bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502907 13f79535-47bb-0310-9956-ffa450edef68
2013-07-13 22:42:47 +00:00
Colin McCabe d93e7ca15d HADOOP-9703. org.apache.hadoop.ipc.Client leaks threads on stop (Tsuyoshi OZAWA via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502704 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 21:55:15 +00:00
Todd Lipcon ce5acc180b HDFS-4982. JournalNode should relogin from keytab before fetching logs from other JNs. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502683 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 20:44:50 +00:00
Suresh Srinivas c7bf3e4ad8 HDFS-4912. Merge 1502634 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502640 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 17:57:46 +00:00
Chris Nauroth 71a4677f6a HDFS-4374. Merging change r1502331 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502426 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 05:10:38 +00:00
Chris Nauroth 9f5667fe27 HDFS-4373. Merging change r1502328 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502423 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 04:53:17 +00:00
Chris Nauroth 5039a956ff HDFS-4372. Merging change r1502120 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502419 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 04:35:43 +00:00
Jing Zhao a52f448e21 HDFS-4978. Merge r1502400 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502402 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 00:21:10 +00:00
Colin McCabe 82ecf50a40 HADOOP-9418. Add symlink support to DistributedFileSystem (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502384 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 22:08:44 +00:00
Alejandro Abdelnur 33465b6050 YARN-333. Schedulers cannot control the queue-name of an application. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502376 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 21:41:10 +00:00
Colin McCabe 8c4362709a HADOOP-9417. Support for symlink resolution in LocalFileSystem / RawLocalFileSystem. (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502323 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 18:32:06 +00:00
Suresh Srinivas 674a7ce699 HDFS-4980. Missed change to CHANGES.txt from previous commit 1502308
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502311 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 18:13:59 +00:00
Suresh Srinivas def7fcb3a7 HDFS-4980. Merge 1502302 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502308 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 18:11:27 +00:00
Steve Loughran 31d59d378a HADOOP-9432 Add support for markdown .md files in site documentation
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502259 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 16:03:44 +00:00
Christopher Douglas 495c24331e YARN-569. Add support for requesting and enforcing preemption requests via
a capacity monitor. Contributed by Carlo Curino, Chris Douglas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502084 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 01:20:37 +00:00
Alejandro Abdelnur f0983d958d updating CHANGES.txt after committing MAPREDUCE-5333,HADOOP-9661,HADOOP-9355,HADOOP-9673,HADOOP-9414,HADOOP-9416,HDFS-4797,YARN-866,YARN-736,YARN-883 to 2.1-beta branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502074 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 00:21:49 +00:00
Chris Nauroth 9bd8745846 MAPREDUCE-4374. Merging change r1502046 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502048 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 23:08:34 +00:00
Tsz-wo Sze 2d339dd0ea In CHANGES.txt, move HDFS-4908 to 2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502010 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 21:28:27 +00:00
Tsz-wo Sze 221014137b HDFS-4645. Move from randomly generated block ID to sequentially generated block ID. Contributed by Arpit Agarwal
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501993 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 21:00:57 +00:00
Alejandro Abdelnur 944401defd HDFS-4969. WebhdfsFileSystem expects non-standard WEBHDFS Json element. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501870 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 17:35:44 +00:00
Vinod Kumar Vavilapalli 66b20f8486 YARN-295. Fixed a race condition in ResourceManager RMAppAttempt state machine. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1501856 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501857 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 17:09:41 +00:00
Vinod Kumar Vavilapalli 56f8a1a6f3 YARN-368. Fixed a typo in error message in Auxiliary services. Contributed by Albert Chu.
svn merge --ignore-ancestry -c 1501852 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501853 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 17:03:14 +00:00
Kihwal Lee 2d88e826e1 svn merge -c 1501841. Merging from trunk to branch-2 to fix HDFS-4887.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501843 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 16:42:38 +00:00
Bikas Saha 88a0d9cc2c Merge r1501605 from trunk to branch-2 for YARN-369. Handle ( or throw a proper error when receiving) status updates from application masters that have not registered (Mayank Bansal & Abhishek Kapoor via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501606 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 23:20:08 +00:00
Hitesh Shah 1157061429 merge -c 1501599 from trunk to branch-2 to fix YARN-727, MAPREDUCE-5325. ClientRMProtocol.getAllApplications should accept ApplicationType as a parameter. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501600 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 23:07:15 +00:00
Alejandro Abdelnur 29090d45af HDFS-4951. FsShell commands using secure httpfs throw exceptions due to missing TokenRenewer. (rknater via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501452 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 18:43:43 +00:00
Chris Nauroth 57366664dd HADOOP-8440. Merging change r1501424 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501435 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 18:26:08 +00:00
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