Commit Graph

6658 Commits

Author SHA1 Message Date
Arpit Agarwal ca330e398e HDFS-6752: Merging r1613487 from branch-2 to branch-2.5.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1613492 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 18:49:50 +00:00
Karthik Kambatla 3a2da93a50 YARN-2335. Annotate all hadoop-sls APIs as @Private. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1613481 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 17:36:33 +00:00
Andrew Wang e62a5c4ee1 HDFS-6696. Name node cannot start if the path of a file under construction contains .snapshot. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1613331 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 23:44:26 +00:00
Haohui Mai 0a6384ba02 HDFS-6723. Merge r1613222 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1613223 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 18:06:29 +00:00
Arpit Agarwal aa178330e4 HADOOP-10894: Merging r1613201 from branch-2 to branch-2.5.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1613203 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 17:47:50 +00:00
Zhijie Shen 08e7967feb YARN-2300. Improved the documentation of the sample requests for RM REST API - submitting an app. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1612981 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612983 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 03:16:03 +00:00
Uma Maheswara Rao G 4fdc89ff19 Merge from trunk. HDFS-6422. getfattr in CLI doesn't throw exception or return non-0 return code when xattr doesn't exist. (Charles Lamb via umamahesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612924 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 19:08:02 +00:00
Arpit Agarwal 8d36a919d5 HADOOP-10890: Merging r1612917 from branch-2 to branch-2.5.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612918 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 18:54:24 +00:00
Arpit Agarwal 410c24e5f8 HADOOP-10872: Merging r1612897 from branch-2 to branch-2.5.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612898 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 17:50:39 +00:00
Brandon Li dad43cf48b HDFS-6703. Merging change r1612705 from branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612709 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 21:52:00 +00:00
Arpit Agarwal b520b89852 HDFS-6712: Merging r1612696 from branch-2 to branch-2.5.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612697 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 20:33:49 +00:00
Arpit Agarwal 12b44f03cd HADOOP-10864: Merging r1612610 from branch-2 to branch-2.5.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612611 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 16:58:13 +00:00
Zhijie Shen f08f5d1086 YARN-2319. Made the MiniKdc instance start/close before/after the class of TestRMWebServicesDelegationTokens. Contributed by Wenwu Peng.
svn merge --ignore-ancestry -c 1612588 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612592 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 15:18:50 +00:00
Zhijie Shen 24f813aa20 YARN-2270. Made TestFSDownload#testDownloadPublicWithStatCache be skipped when there’s no ancestor permissions. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1612460 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612462 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 05:04:14 +00:00
Tsz-wo Sze 8dbe1b4d2c svn merge -c 1612427 from trunk for HDFS-6680. BlockPlacementPolicyDefault does not choose favored nodes correctly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1612431 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 23:26:06 +00:00
Aaron Myers b6c10254cc HDFS-6632. Reintroduce dfs.http.port / dfs.https.port in branch-2. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1611807 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 21:09:51 +00:00
Daryn Sharp 61235ba880 svn merge -c 1611737 FIXES: HDFS-6599. 2.4 addBlock is 10 to 20 times slower compared to 0.23 (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1611739 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 18:04:49 +00:00
Karthik Kambatla 8ba7b7587d MAPREDUCE-5952. LocalContainerLauncher#renameMapOutputForReduce incorrectly assumes a single dir for mapOutIndex. (Gera Shegalov via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1611199 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 21:33:30 +00:00
Vinod Kumar Vavilapalli 1e446dbfc8 YARN-2233. Implemented ResourceManager web-services to create, renew and cancel delegation tokens. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1610876 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1610878 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 23:01:05 +00:00
Mayank Bansal 2cfc25ed5a YARN-1408 Preemption caused Invalid State Event: ACQUIRED at KILLED and caused a task timeout for 30mins. (Sunil G via mayank)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1610872 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 22:43:07 +00:00
Jason Darrell Lowe 986d167ada svn merge -c 1610829 FIXES: Addendum patch for HADOOP-10468 TestMetricsSystemImpl.testMultiThreadedPublish fails intermediately. Contributed by Akira AJISAKA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1610831 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 20:00:54 +00:00
Vinod Kumar Vavilapalli b3b2b195e4 MAPREDUCE-5790. Made it easier to enable hprof profile options by default. Contributed by Gera Shegalov.
svn merge --ignore-ancestry -c 1610578 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1610580 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 04:50:37 +00:00
Brandon Li b8391fc397 HDFS-6378. Merging change r1610545 from branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1610546 13f79535-47bb-0310-9956-ffa450edef68
2014-07-14 22:01:13 +00:00
Kihwal Lee a08f3d0b76 svn merge -c 1609543 merging from trunk to branch-2.5 to fix:HDFS-6647. Edit log corruption when pipeline recovery occurs for deleted file present in snapshot. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1609546 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 18:20:16 +00:00
Chris Nauroth a712d2ae74 HDFS-6614. Merging change r1609536 from branch-2 to branch-2.5.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1609540 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 18:11:49 +00:00
Colin McCabe f4b50df294 HDFS-6622. Rename and AddBlock may race and produce invalid edits (kihwal via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1609385 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 04:06:44 +00:00
Colin McCabe 97d22609c0 HDFS-6618. FSNamesystem#delete drops the FSN lock between removing INodes from the tree and deleting them from the inode map (kihwal via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1609382 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 03:57:24 +00:00
Steve Loughran 5c20ebc183 HADOOP-10801 dead link in site.xml
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1609091 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 10:54:46 +00:00
Chris Nauroth 12bbe018ef HDFS-6614. Merging change r1608847 from branch-2 to branch-2.5.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608855 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 17:13:55 +00:00
Uma Maheswara Rao G 2d439fd0c1 Mreged from trunk. HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608786 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 13:54:49 +00:00
Uma Maheswara Rao G 2da1a373e3 Merged from trunk. HDFS-4221. Remove the format limitation point from BKJM documentation as HDFS-3810 closed. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608778 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 13:33:55 +00:00
Uma Maheswara Rao G 53c928a8de Merged from trunk. HDFS-4286. Changes from BOOKKEEPER-203 broken capability of including bookkeeper-server jar in hidden package of BKJM. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608771 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 13:20:51 +00:00
Mayank Bansal edb01aaca4 YARN-2022 Preempting an Application Master container can be kept as least priority when multiple applications are marked for preemption by ProportionalCapacityPreemptionPolicy (Sunil G via mayank)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608689 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 08:34:02 +00:00
Zhijie Shen df2301d519 YARN-2158. Improved assertion messages of TestRMWebServicesAppsModification. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1608667 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608669 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 06:09:53 +00:00
Vinod Kumar Vavilapalli 744876efc0 MAPREDUCE-5517. Fixed MapReduce ApplicationMaster to not validate reduce side resource configuration for deciding uber-mode on map-only jobs. Contributed by Siqi Li.
svn merge --ignore-ancestry -c 1608595 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608598 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 20:14:52 +00:00
Vinod Kumar Vavilapalli ef0079813d MAPREDUCE-5868. Fixed an issue with TestPipeApplication that was causing the nightly builds to fail. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1608579 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608581 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 19:47:59 +00:00
Sanford Ryza 737e8ce8fd YARN-2250. FairScheduler.findLowestCommonAncestorQueue returns null when queues not identical (Krisztian Horvath via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607874 13f79535-47bb-0310-9956-ffa450edef68
2014-07-04 15:17:23 +00:00
Andrew Wang 0d8f05fb0a HDFS-6493. Change dfs.namenode.startup.delay.block.deletion to second instead of millisecond. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607734 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 20:03:08 +00:00
Uma Maheswara Rao G f27470d984 Merge from trunk. HDFS-6620. Snapshot docs should specify about preserve options with cp command. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607687 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 16:14:13 +00:00
Steve Loughran 6818a66eb3 HADOOP-9361: changes.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607633 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 13:02:14 +00:00
Steve Loughran 3ac34fb557 HADOOP-9361: changes.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607618 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:49:42 +00:00
Steve Loughran 1c65bf7f2a HADOOP-9361: site and gitignore
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607617 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:48:37 +00:00
Steve Loughran 2f68c35ffe HADOOP-9361: Strictly define FileSystem APIs - OpenStack portion
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607615 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:47:50 +00:00
Steve Loughran 8fb69f0e7f HADOOP-9361: Strictly define FileSystem APIs - HDFS portion
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607614 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:47:03 +00:00
Steve Loughran 4022b9642d HADOOP-9361: Strictly define FileSystem APIs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607613 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:44:24 +00:00
Steve Loughran c2681e1c8c HADOOP-10312 Shell.ExitCodeException to have more useful toString
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607590 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 11:22:20 +00:00
Karthik Kambatla f3613aa885 Reverting r1607539. Remove 2.6.0 sections from CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607542 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 06:21:19 +00:00
Karthik Kambatla e6ed765bf7 Branching for 2.5 releases
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1607540 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 06:00:18 +00:00
Karthik Kambatla 8380254440 Preparing for release 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607539 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 05:56:01 +00:00
Zhijie Shen 38bb24538d MAPREDUCE-5900. Changed to the interpret container preemption exit code as a task attempt killing event. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1607512 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607513 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 01:45:53 +00:00