Commit Graph

4932 Commits

Author SHA1 Message Date
Bikas Saha 34a1610282 YARN-873. Merge r1506732 from trunk to branch-2 for YARNClient.getApplicationReport(unknownAppId) returns a null report (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506736 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 21:42:50 +00:00
Kihwal Lee b2b14eb45e svn merge -c 1506675 merging from trunk to branch-2 to fix YARN-968.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506678 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 19:45:49 +00:00
Kihwal Lee 562cd12535 Fix CHANGES.txt in hdfs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506561 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 14:02:55 +00:00
Jing Zhao e074e65f91 HADOOP-9762. Merge change r1506426 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506428 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 07:51:32 +00:00
Jing Zhao 4be83f8e79 HDFS-5020. Merge change r1506421 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506424 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 07:33:50 +00:00
Jing Zhao b98e6a2245 HADOOP-9763. Merge change r1506405 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506408 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 06:38:20 +00:00
Vinod Kumar Vavilapalli f487f4eb19 YARN-926. Modified ContainerManagerProtcol APIs to take in requests for multiple containers. Contributed by Jian He.
MAPREDUCE-5412. Update MR app to use multiple containers API of ContainerManager after YARN-926. Contributed by Jian He.
svn merge --ignore-ancestry -c 1506391 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506392 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 03:42:52 +00:00
Chris Nauroth 366eda548b HADOOP-9759. Merging change r1506325 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506329 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 22:13:04 +00:00
Jason Darrell Lowe d6be90bccf svn merge -c 1506226 FIXES: MAPREDUCE-5356. Ability to refresh aggregated log retention period and check interval. Contributed by Ashwin Shankar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506230 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 19:25:19 +00:00
Colin McCabe 5ff0774e8a HDFS-4817. Make HDFS advisory caching configurable on a per-file basis. (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506188 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 17:54:44 +00:00
Jason Darrell Lowe 673b762364 svn merge -c 1506154 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@1506157 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 16:58:41 +00:00
Suresh Srinivas f284b538fd HDFS-4974. Merge 1505911 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505912 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 06:44:47 +00:00
Suresh Srinivas 5c05d70c13 HADOOP-9760. Merge 1505875 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505876 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 01:47:09 +00:00
Alejandro Abdelnur 7f8549f4c9 YARN-461. Fair scheduler should not accept apps with empty string queue name. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505862 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 00:02:22 +00:00
Vinod Kumar Vavilapalli 10e4f3b4bd YARN-853. Fixed CapacityScheduler's maximum-am-resource-percent to properly work beyond refreshing queues. Contributed by Devaraj K.
svn merge --ignore-ancestry -c 1505855 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505856 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 23:50:54 +00:00
Vinod Kumar Vavilapalli 9c790a8fb7 Fixing YARN CHANGES.txt. The general bug list got mixed up with HADOOP-8562 sub-tasks.
svn merge --ignore-ancestry -c 1505847 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505848 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 23:32:51 +00:00
Jason Darrell Lowe 726533a741 svn merge -c 1505771 FIXES: MAPREDUCE-5404. HSAdminServer does not use ephemeral ports in minicluster mode. Contributed by Ted Yu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505772 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 19:06:07 +00:00
Jing Zhao 5758018f1b HDFS-5008. Merge change r1505761 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505764 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 18:27:55 +00:00
Colin McCabe ab17599b03 HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505748 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 17:58:11 +00:00
Tsz-wo Sze dbf8d190d2 svn merge -c 1505610 from trunk for HADOOP-9754. Remove unnecessary "throws IOException/InterruptedException", and fix generic and other javac warnings.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505613 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 07:41:33 +00:00
Jing Zhao 9b8a60f44f HDFS-5018. Merge change r1505603 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505604 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 05:33:40 +00:00
Uma Maheswara Rao G 9293341473 Merge r1505362 from trunk. HDFS-4602. TestBookKeeperHACheckpoints fails. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505364 13f79535-47bb-0310-9956-ffa450edef68
2013-07-21 12:33:33 +00:00
Kihwal Lee e22e6725f9 svn merge -c 1505160 merging to branch-2 to fix HDFS-5010.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505161 13f79535-47bb-0310-9956-ffa450edef68
2013-07-20 16:26:06 +00:00
Arun Murthy 98932b2c88 Merge -c 1505146 from trunk to branch-2 to fix YARN-897. Ensure child queues are ordered correctly to account for completed containers. Contributed by Djellel Eddine Difallah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505147 13f79535-47bb-0310-9956-ffa450edef68
2013-07-20 15:00:28 +00:00
Suresh Srinivas 0d85f58035 HADOOP-9751. Merge r1505036 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505059 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 22:40:26 +00:00
Suresh Srinivas d7e32b0451 HADOOP-9717. Merge r1504725 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505053 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 22:20:09 +00:00
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