Commit Graph

6636 Commits

Author SHA1 Message Date
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
Andrew Wang 4eb15fa356 HDFS-6610. TestShortCircuitLocalRead tests sometimes timeout on slow machines. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607497 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 23:02:47 +00:00
Vinod Kumar Vavilapalli 8126744506 YARN-2022. Fixing CHANGES.txt to be correctly placed.
svn merge --ignore-ancestry -c 1607486 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607487 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 21:52:13 +00:00
Vinod Kumar Vavilapalli 0ac01d7cfc YARN-2232. Fixed ResourceManager to allow DelegationToken owners to be able to cancel their own tokens in secure mode. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1607484 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607485 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 21:37:20 +00:00
Karthik Kambatla 99bced167b YARN-2241. ZKRMStateStore: On startup, show nicer messages if znodes already exist. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607475 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 20:36:09 +00:00
Colin McCabe a9cf4e7a98 HDFS-6604. The short-circuit cache doesn't correctly time out replicas that haven't been used in a while (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607459 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 19:46:29 +00:00
Chris Nauroth c661b13e2e HDFS-6614. Merging change r1607447 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607448 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 19:01:22 +00:00
Andrew Wang c35fc5815d HDFS-6612. MiniDFSNNTopology#simpleFederatedTopology(int) always hardcode nameservice ID. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607443 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 18:37:32 +00:00
Steve Loughran 4cfc90590c YARN-2065 AM cannot create new containers after restart
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607440 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 18:34:09 +00:00
Chris Nauroth b66441827b HDFS-6603. Merging change r1607239 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607240 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 03:24:00 +00:00
Karthik Kambatla 14858cd6f7 YARN-2204. Explicitly enable vmem check in TestContainersMonitor#testContainerKillOnMemoryOverflow. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607233 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 02:07:48 +00:00
Vinod Kumar Vavilapalli 8f1f458729 YARN-1713. Added get-new-app and submit-app functionality to RM web services. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1607216 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607217 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 00:23:49 +00:00
Chris Nauroth 8460971241 HADOOP-10767. Merging change r1607133 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607134 13f79535-47bb-0310-9956-ffa450edef68
2014-07-01 16:36:19 +00:00
Chris Nauroth 5a918b6b09 HDFS-6591. Merging change r1606927 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606931 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 20:57:50 +00:00
Alejandro Abdelnur 959f5ae65c HADOOP-10710. hadoop.auth cookie is not properly constructed according to RFC2109. (Juan Yu via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606925 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 20:42:40 +00:00
Kihwal Lee 905b8c0895 svn merge -c 1606855 merging from trunk to branch-2 to fix:HDFS-6558. Missing newline in the description of dfsadmin -rollingUpgrade. Contributed by Chen He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606856 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 18:18:53 +00:00
Xuan Gong c2eaeadaab TestRMApplicationHistoryWriter sometimes fails in trunk. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606834 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 16:51:04 +00:00
Jian He a385b77df7 Merge r1606557 from trunk. YARN-2052. Embedded an epoch number in container id to ensure the uniqueness of container id after RM restarts. Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606558 13f79535-47bb-0310-9956-ffa450edef68
2014-06-29 18:26:08 +00:00
Steve Loughran 56294d8457 HDFS-6418. Regression: DFS_NAMENODE_USER_NAME_KEY missing
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606534 13f79535-47bb-0310-9956-ffa450edef68
2014-06-29 16:19:16 +00:00
Jian He c63e3f027b Merge r1606407 from trunk. YARN-614. Changed ResourceManager to not count disk failure, node loss and RM restart towards app failures. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606408 13f79535-47bb-0310-9956-ffa450edef68
2014-06-28 23:41:51 +00:00
Kihwal Lee 28b82d46af svn merge -c 1606371 merging from trunk to branch-2 to fix:HDFS-6601. Issues in finalizing rolling upgrade when there is a layout version change.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606372 13f79535-47bb-0310-9956-ffa450edef68
2014-06-28 15:25:18 +00:00
Uma Maheswara Rao G e41a821997 Merge from trunk. HDFS-6556. Refine XAttr permissions. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606322 13f79535-47bb-0310-9956-ffa450edef68
2014-06-28 11:49:57 +00:00
Zhijie Shen 705a5cede9 YARN-2201. Made TestRMWebServicesAppsModification be independent of the changes on yarn-default.xml. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1606285 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606286 13f79535-47bb-0310-9956-ffa450edef68
2014-06-28 03:33:46 +00:00