Commit Graph

6857 Commits

Author SHA1 Message Date
Jing Zhao 2581a1cd1b HDFS-6640. Merge change r1609603 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609605 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 01:29:49 +00:00
Jian He 349b0e3cfb Merge r1609594 from trunk. Moved few YARN entries in CHANGES.txt from 2.5 to 2.6
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609595 13f79535-47bb-0310-9956-ffa450edef68
2014-07-11 00:10:05 +00:00
Xuan Gong b588da4eb4 YARN-2269. Remove external links from YARN UI. Contributed by Craig Welch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609591 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 23:32:36 +00:00
Jian He 7cfc7e39a4 Merge r1609584 from trunk. YARN-2088. Fixed a bug in GetApplicationsRequestPBImpl#mergeLocalToBuilder. Contributed by Binglin Chang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609585 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 22:38:51 +00:00
Karthik Kambatla 80c26f5c5d YARN-2224. Fix CHANGES.txt. This was committed as YARN-2204 before.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609583 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 22:18:54 +00:00
Jian He d90b47f8bc Merge r1609561 from trunk. YARN-2181. Added preemption info to logs and RM web UI. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609562 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 20:05:20 +00:00
Kihwal Lee f1cfc9b4cf svn merge -c 1609543 merging from trunk to branch-2 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@1609544 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 18:19:40 +00:00
Chris Nauroth 4b7196d2ce HDFS-6631. Merging change r1609534 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609536 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 18:07:03 +00:00
Chris Nauroth d3f53852bc HADOOP-10808. Merging change r1609509 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609512 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 17:14:24 +00:00
Chris Nauroth 41406e3702 HADOOP-10507. Merging change r1609503 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609506 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 17:03:08 +00:00
Tsz-wo Sze 52a07f1a39 svn merge -c 1609401 from trunk for HDFS-6643. Refactor INodeWithAdditionalFields.PermissionStatusFormat and INodeFile.HeaderFormat.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609402 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 06:17:55 +00:00
Jing Zhao f1e29d5800 HDFS-6645. Merge change r1609388 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609393 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 05:14:08 +00:00
Colin McCabe 05f49b8e37 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@1609386 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 04:07:14 +00:00
Colin McCabe 2e7261d75a 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@1609381 13f79535-47bb-0310-9956-ffa450edef68
2014-07-10 03:54:20 +00:00
Karthik Kambatla 02f72d7a6b YARN-2131. Add a way to format the RMStateStore. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609280 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 20:03:18 +00:00
Jian He b05080053e Merge r1609254 from trunk. YARN-1366. Changed AMRMClient to re-register with RM and send outstanding requests back to RM on work-preserving RM restart. Contributed by Rohith
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609255 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 18:28:00 +00:00
Steve Loughran 4a97dec701 HADOOP-10801 dead link in site.xml
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609093 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 10:56:32 +00:00
Vinayakumar B 86443513b3 Merged revision(s) 1609020 from hadoop/common/trunk:
HDFS-6646. [ HDFS Rolling Upgrade - Shell ] shutdownDatanode and getDatanodeInfo usage is missed ( Contributed by Brahma Reddy Battula)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609021 13f79535-47bb-0310-9956-ffa450edef68
2014-07-09 06:07:07 +00:00
Chris Nauroth 18a54c1e16 HDFS-6627. Merging change r1608940 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608948 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 20:31:14 +00:00
Colin McCabe a919e86452 move HADOOP-10781 to 2.6
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608935 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 20:12:47 +00:00
Chris Nauroth 7c49fb7582 HDFS-6638. Merging change r1608905 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608911 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 19:29:00 +00:00
Colin McCabe 96bfab8dbc HADOOP-10781. Unportable getgrouplist usage breaks FreeBSD (Dmitry Sivachenko via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608871 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 18:17:28 +00:00
Chris Nauroth 822790d5af HDFS-6614. Merging change r1608846 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608847 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 16:48:01 +00:00
Uma Maheswara Rao G 5b832979e1 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@1608784 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 13:53:42 +00:00
Uma Maheswara Rao G 50c7825d10 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@1608777 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 13:33:05 +00:00
Uma Maheswara Rao G 5e22de1cf7 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@1608769 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 13:19:31 +00:00
Zhijie Shen 077278fa9e 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@1608668 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 06:09:09 +00:00
Vinod Kumar Vavilapalli fd6f4f72e4 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@1608596 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 20:14:33 +00:00
Chris Nauroth 00ff3d320a MAPREDUCE-5866. Merging change r1608585 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608588 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 20:00:38 +00:00
Vinod Kumar Vavilapalli 29099c8a5c 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@1608580 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 19:46:31 +00:00
Suresh Srinivas 52d8da41d9 HADOOP-10782. Merge r1608539 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608541 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 18:14:22 +00:00
Chris Nauroth 1a0950b745 HDFS-6617. Merging change r1608522 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608523 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 17:38:56 +00:00
Jian He 77a94b73b2 Merge r1608334 from trunk. YARN-1367. Changed NM to not kill containers on NM resync if RM work-preserving restart is enabled. Contributed by Anubhav Dhoot
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608336 13f79535-47bb-0310-9956-ffa450edef68
2014-07-07 04:40:36 +00:00
Sanford Ryza 92de5cae9b 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@1607873 13f79535-47bb-0310-9956-ffa450edef68
2014-07-04 15:17:14 +00:00
Junping Du b81b6b6366 Merge r1607833 from Trunk: YARN-2251. Avoid negative elapsed time in JHS/MRAM web UI and services (Contributed by Zhijie Shen)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607834 13f79535-47bb-0310-9956-ffa450edef68
2014-07-04 11:20:43 +00:00
Andrew Wang e6e5417134 HDFS-6511. BlockManager#computeInvalidateWork() could do nothing. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607736 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 20:11:18 +00:00
Andrew Wang 3470a34c22 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@1607733 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 20:02:46 +00:00
Andrew Wang 7cb89369bb HDFS-6613. Improve logging in caching classes. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607698 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 17:14:18 +00:00
Uma Maheswara Rao G 547b19d1a3 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@1607686 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 16:12:23 +00:00
Junping Du 0d50c2f697 Merge r1607655 from trunk: YARN-2242. Improve exception information on AM launch crashes. (Contributed by Li Lu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607656 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 14:19:18 +00:00
Steve Loughran 33248102a1 HADOOP-10312 changes.txt updated in wrong place
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607632 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 13:00:59 +00:00
Steve Loughran 6e24e1837f HADOOP-9361: changes.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607629 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:56:57 +00:00
Steve Loughran 6441c4c626 HADOOP-9361: site and gitignore
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607626 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:56:17 +00:00
Steve Loughran e87785aea4 HADOOP-9361: Strictly define FileSystem APIs - OpenStack portion
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607625 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:55:23 +00:00
Steve Loughran d6fd16c8dc HADOOP-9361: Strictly define FileSystem APIs - HDFS portion
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607623 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:54:15 +00:00
Steve Loughran 6ba46c2dfc HADOOP-9361: Strictly define FileSystem APIs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607621 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:52:49 +00:00
Karthik Kambatla 9133e3142c Preparing for 2.6.0 development. Updated versions.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 06:11:57 +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