Commit Graph

4756 Commits

Author SHA1 Message Date
Suresh Srinivas 73832071ea HADOOP-9716. Merge r1504362 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505052 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 22:15:19 +00:00
Suresh Srinivas 7ac2c423cc HADOOP-9691. Merge r1501615 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505042 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:59:14 +00:00
Suresh Srinivas 6e967c10f3 HADOOP-9720 merge r1502301 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505040 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:55:50 +00:00
Suresh Srinivas bddbc5b0ed Revert r1505037 to fix the commit text
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505039 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:52:56 +00:00
Suresh Srinivas 8f3eba332d HADOOP-9691. Merge r1501615 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505037 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:50:15 +00:00
Suresh Srinivas 6c37a1584e HADOOP-9688 merge r1500843 and r1500847 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505030 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:37:43 +00:00
Suresh Srinivas 3f901c051d Revert the merge r1505005
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505009 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 20:49:13 +00:00
Suresh Srinivas fa89218fc8 HADOOP-9688 merge r1500843 and r1500847, and HADOOP-9720 merge r1502301 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505005 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 20:41:10 +00:00
Hitesh Shah c2a02fb917 merge -c 1504970 from trunk to branch-2 to fix YARN-919. Document setting default heap sizes in yarn env.sh Contributed by Mayank Bansal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504971 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 19:24:13 +00:00
Alejandro Abdelnur 7d613f766e ADOOP-9643. org.apache.hadoop.security.SecurityUtil calls toUpperCase(Locale.getDefault()) as well as toLowerCase(Locale.getDefault()) on hadoop.security.authentication value. (markrmiller@gmail.com via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504966 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 19:02:46 +00:00
Daryn Sharp 69aaf11467 merge -c 1504874 FIXES: HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504875 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 13:39:50 +00:00
Harsh J f6b0fa487b HDFS-4278. Log an ERROR when DFS_BLOCK_ACCESS_TOKEN_ENABLE config is disabled but security is turned on. Contributed by Kousuke Saruta. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504790 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 07:05:57 +00:00
Jing Zhao 089b7e63e7 HDFS-5007. Merge change r1504764 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504765 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 05:46:28 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:35:34 +00:00
Arun Murthy 1f65519b8a Fixed CHANGES.txt to reflect that new content in branch-2 goes to hadoop-2.3.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504743 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:30:18 +00:00
Arun Murthy 78137a3634 Fixed CHANGES.txt to reflect that all fixes in 2.1.1-beta are now in 2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504739 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:04:10 +00:00
Arun Murthy f7080007ad Merge -c 1504735 from trunk to branch-2 to fix YARN-918. Remove ApplicationAttemptId from RegisterApplicationMasterRequestProto. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504736 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 00:58:33 +00:00
Vinod Kumar Vavilapalli 384c86f6e1 YARN-814. Improving diagnostics when containers fail during launch due to various reasons like invalid env etc. Contributed by Jian He.
svn merge --ignore-ancestry -c 1504732 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504733 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 00:28:53 +00:00
Luke Lu 62f557775b HADOOP-9164. Print paths of loaded native libraries in NativeLibraryChecker. (Binglin Chang via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504706 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 22:44:43 +00:00
Chris Nauroth bddf1659f8 HDFS-4996. Merging change r1504679 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504682 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 22:05:10 +00:00
Jason Darrell Lowe 9b1bc20045 svn merge -c 1504645 FIXES: MAPREDUCE-5265. History server admin service to refresh user and superuser group mappings. Contributed by Ashwin Shankar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504653 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 20:47:58 +00:00
Arun Murthy d82a3cd227 Merge -c from trunk to branch-2 to fix YARN-701. Use application tokens irrespective of secure or non-secure mode. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504605 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 19:04:37 +00:00
Chris Nauroth f736ef62b2 HDFS-5003. Merging change r1504352 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504353 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 03:32:03 +00:00
Jing Zhao 18024e683a HDFS-5005. Merging r1504326 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504327 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 00:15:09 +00:00
Hitesh Shah db854fd104 Merge r1504288 from trunk to branch-2 for YARN-865. RM webservices can't query based on application Types. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504290 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 21:43:51 +00:00
Bikas Saha 859b53435f Merge r1504261 from trunk to branch-2 for YARN-922. Change FileSystemRMStateStore to use directories (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504264 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 20:23:55 +00:00
Colin McCabe 2dba05af50 fix misspelling in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504230 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 18:41:53 +00:00
Vinod Kumar Vavilapalli 9b3b4fe8bb YARN-912. Move client facing exceptions to yarn-api module. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1504032 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504033 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 07:32:23 +00:00
Vinod Kumar Vavilapalli a6865504d7 YARN-62. Modified NodeManagers to avoid AMs from abusing container tokens for repetitive container launches. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1503986 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503987 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 04:25:17 +00:00
Kihwal Lee 727acb377e svn merge -c 1503976 merging to branch-2 to fix HADOOP-9738. TestDistCh fails. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503977 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 02:24:18 +00:00
Kihwal Lee 17e8683dc1 svn merge -c 1503971 merging to branch-2 fix HDFS-4998.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503972 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 02:04:04 +00:00
Bikas Saha ace3a40b23 Merge r1503960 from trunk to branch-2 for YARN-927. Change ContainerRequest to not have more than 1 container count and remove StoreContainerRequest (bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503965 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 01:01:03 +00:00
Jason Darrell Lowe a55ae9e988 svn merge -c 1503957 FIXES: MAPREDUCE-5380. Invalid mapred command should return non-zero exit code. Contributed by Stephen Chu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503958 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 00:31:52 +00:00
Jason Darrell Lowe 2767f51220 svn merge -c 1503954 FIXES: HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503955 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 00:12:05 +00:00
Kihwal Lee 91469526ce svn merge -c 1477344 to branch-2 to fix HDFS-4687.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503952 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 23:58:56 +00:00
Vinod Kumar Vavilapalli 0623ee954a YARN-820. Fixed an invalid state transition in NodeManager caused by failing resource localization. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1503947 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503948 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 23:45:29 +00:00
Vinod Kumar Vavilapalli 14adc33eb4 YARN-661. Fixed NM to cleanup users' local directories correctly when starting up. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1503942 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503943 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 23:31:29 +00:00
Bikas Saha 41c05101e7 Merge r1503934 from trunk to branch-2 for MAPREDUCE-5398. MR changes for YARN-513 (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503936 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:56:54 +00:00
Bikas Saha 3990e8b478 Merge r1503933 from trunk to branch-2 for YARN-513. Create common proxy client for communicating with RM (Xuan Gong & Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503935 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:54:55 +00:00
Bikas Saha 0055e40226 Trivial fix for minor refactor error for YARN-521
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503922 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:15:47 +00:00
Kihwal Lee 1642f06cd8 HDFS-4999. Fix TestShortCircuitLocalRead on branch-2. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503898 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 21:31:21 +00:00
Colin McCabe 4c45da1ab7 HDFS-4657. Limit the number of blocks logged by the NN after a block report to a configurable value. (Aaron Twinning Meyers via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503864 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 20:11:26 +00:00
Daryn Sharp 192f6b86cc HADOOP-9683. [RPC v9] Wrap IpcConnectionContext in RPC headers (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503830 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 18:59:29 +00:00
Colin McCabe 62f5c14df2 HADOOP-9618. thread which detects GC pauses (Todd Lipcon via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503810 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 17:57:44 +00:00
Jason Darrell Lowe 2386e127b8 svn merge -c 1503744 to revert MAPREDUCE-5317. Stale files left behind for failed jobs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503747 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 15:06:42 +00:00
Tsz-wo Sze 6f1452044a svn merge -c 1503720 from trunk for HDFS-4992. Make balancer's mover thread count and dispatcher thread count configurable.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503721 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 14:07:22 +00:00
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