Vinod Kumar Vavilapalli
2f7c04f53a
MAPREDUCE-5159. Change ValueAggregatorJob to add APIs which can support binary compatibility with hadoop-1 examples. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1480394 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480396 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 18:29:10 +00:00
Aaron Myers
e422a22297
YARN-646. Fix two typos in Fair Scheduler user guide. Contributed by Dapeng Sun.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480361 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 17:18:59 +00:00
Vinod Kumar Vavilapalli
0ec689c9a8
YARN-582. Changed ResourceManager to recover Application token and client tokens for app attempt so that RM can be restarted while preserving current applications. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1480168 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480169 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 06:21:02 +00:00
Vinod Kumar Vavilapalli
e5ce72fb4e
YARN-651. Changed PBClientImpls of ContainerManager and RMAdmin to throw IOExceptions also. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1480154 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480155 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 04:17:40 +00:00
Devaraj Das
0effce3ff0
HDFS-2576. Fixed some compilation issues. Affects only branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480151 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 03:12:58 +00:00
Devaraj Das
1dd166d72e
Merge -r 1477848:1477849 from trunk onto branch-2. Fixes HDFS-4778.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480136 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 00:12:01 +00:00
Devaraj Das
471b37704a
Merge -r 1476394:1476395 from trunk onto branch-2. Fixes HDFS-2576.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480135 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 00:05:18 +00:00
Aaron Myers
20fd61951b
HDFS-4804. WARN when users set the block balanced preference percent below 0.5 or above 1.0. Contributed by Stephen Chu.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480099 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 21:42:14 +00:00
Christopher Douglas
e8585afa03
YARN-45. Add protocol for schedulers to request containers back from
...
ApplicationMasters. Contributed by Carlo Curino and Chris Douglas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479773 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 06:18:25 +00:00
Vinod Kumar Vavilapalli
2136542f1b
YARN-632. Changed ContainerManager api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1479740 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479741 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 00:43:32 +00:00
Vinod Kumar Vavilapalli
c114469fbd
YARN-633. Changed RMAdminProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1479738 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479739 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 00:38:57 +00:00
Vinod Kumar Vavilapalli
486391f766
YARN-629. Make YarnRemoteException not be rooted at IOException. Contributed by Xuan Gong.
...
MAPREDUCE-5204. Handling YarnRemoteException separately from IOException in MR app after YARN-629. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1479680 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479684 13f79535-47bb-0310-9956-ffa450edef68
2013-05-06 19:20:02 +00:00
Vinod Kumar Vavilapalli
8b755237f8
YARN-645. Moved RMDelegationTokenSecretManager from yarn-server-common to yarn-server-resourcemanager where it really belongs. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1479022 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479026 13f79535-47bb-0310-9956-ffa450edef68
2013-05-04 01:13:43 +00:00
Vinod Kumar Vavilapalli
fb8d3fb0e4
MAPREDUCE-5205. Fixed MR App to load tokens correctly. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1479016 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479018 13f79535-47bb-0310-9956-ffa450edef68
2013-05-04 00:29:34 +00:00
Vinod Kumar Vavilapalli
e66aae5cc0
HADOOP-9511. Adding support for additional input streams (FSDataInputStream and RandomAccessFile) in SecureIOUtils so as to help YARN-578. Contributed by Omkar Vinit Joshi.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479014 13f79535-47bb-0310-9956-ffa450edef68
2013-05-04 00:20:49 +00:00
Suresh Srinivas
881480a16f
HADOOP-9523. Merge 1478634 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478636 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 03:45:25 +00:00
Vinod Kumar Vavilapalli
0b64df0630
YARN-625. Move the utility method unwrapAndThrowException from YarnRemoteExceptionPBImpl to RPCUtil. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1478594 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478595 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 22:45:30 +00:00
Thomas White
0411165008
Merge -r 1478421:1478422 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default shuffle handler port should not be 8080. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478424 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 16:00:15 +00:00
Suresh Srinivas
bd198d7dfe
HDFS-4784. Merge r1478276 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478287 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 06:56:19 +00:00
Suresh Srinivas
ab8ce0fcda
HDFS-4785. Merge change r1478267 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478286 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 06:48:36 +00:00
Suresh Srinivas
78eaf8c3df
HDFS-4434. Merge r1469644 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478282 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 06:35:58 +00:00
Aaron Myers
96be135ffe
MAPREDUCE-5193. A few MR tests use block sizes which are smaller than the default minimum block size. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478251 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 02:00:44 +00:00
Vinod Kumar Vavilapalli
fbdc7ed67d
YARN-618. Modified RM_INVALID_IDENTIFIER to be -1 instead of zero. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1478230 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478235 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 23:48:32 +00:00
Suresh Srinivas
07f6348192
HADOOP-9455. Merge change r1478067 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478071 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 16:13:37 +00:00
Vinod Kumar Vavilapalli
868362c9b1
MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs inline with YARN. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1477889 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477890 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 00:44:13 +00:00
Aaron Myers
2058ae4927
HADOOP-9338. FsShell Copy Commands Should Optionally Preserve File Attributes. Contributed by Nick White.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477717 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 16:35:38 +00:00
Aaron Myers
a9c43af739
Move the CHANGES.txt entry for HDFS-4305 to the incompatible changes section.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477489 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 07:16:22 +00:00
Vinod Kumar Vavilapalli
e2a1f994a1
YARN-599. Refactoring submitApplication in ClientRMService and RMAppManager to separate out various validation checks depending on whether they rely on RM configuration or not. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1477478 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477479 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 05:44:45 +00:00
Harsh J
c962ae1a3a
HADOOP-9322. LdapGroupsMapping doesn't seem to set a timeout for its directory search. Contributed by Harsh J. (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477460 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 03:07:00 +00:00
Luke Lu
c8d27c48ec
Fix CRLF in html according to HADOOP-8912.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477390 13f79535-47bb-0310-9956-ffa450edef68
2013-04-29 22:36:53 +00:00
Luke Lu
7e462d1423
HADOOP-9194. RPC Support for QoS. (Junping Du via llu)
...
Merged from trunk@1461370.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477388 13f79535-47bb-0310-9956-ffa450edef68
2013-04-29 22:33:39 +00:00
Aaron Myers
0d10e7a16f
HDFS-4305. Add a configurable limit on number of blocks per file, and min block size. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477358 13f79535-47bb-0310-9956-ffa450edef68
2013-04-29 21:41:52 +00:00
Aaron Myers
a3ecc3b910
HDFS-4733. Make HttpFS username pattern configurable. Contributed by Alejandro Abdelnur.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477241 13f79535-47bb-0310-9956-ffa450edef68
2013-04-29 18:07:55 +00:00
Vinod Kumar Vavilapalli
373db7be2a
YARN-516. Reverting the patch from branch-2 as HADOOP-9357 also got reverted.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476839 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 21:15:39 +00:00
Vinod Kumar Vavilapalli
e11dd72dc1
MAPREDUCE-5179. Fix unit test in TestHSWebServices which fails when versionInfo has parantheses like when running on a git checkout. Contributed by Hitesh Shah.
...
svn merge --ignore-ancestry -c 1476835 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476836 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 21:03:01 +00:00
Vinod Kumar Vavilapalli
d5331b18a9
YARN-576. Modified ResourceManager to reject NodeManagers that don't satisy minimum resource requirements. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1476824 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476825 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 20:04:47 +00:00
Suresh Srinivas
f76ad1af85
HDFS-4748. Merge r1476587 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476588 13f79535-47bb-0310-9956-ffa450edef68
2013-04-27 14:32:49 +00:00
Suresh Srinivas
091e5df455
HDFS-4768. Merge 1476579 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476581 13f79535-47bb-0310-9956-ffa450edef68
2013-04-27 14:11:41 +00:00
Jason Darrell Lowe
8f151832cc
svn merge -c 1476487 FIXES: HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo. Contributed by Liang Xie
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476488 13f79535-47bb-0310-9956-ffa450edef68
2013-04-27 04:13:04 +00:00
Tsz-wo Sze
b2927bd936
svn merge -c 1476399 from trunk for HDFS-4721. Speed up lease recovery by avoiding stale datanodes and choosing he datanode with the most recent heartbeat as the primary.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476400 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 20:52:29 +00:00
Vinod Kumar Vavilapalli
ffe3368d94
YARN-562. Modified NM to reject any containers allocated by a previous ResourceManager. Contributed by Jian He.
...
MAPREDUCE-5167. Update MR App after YARN-562 to use the new builder API for the container. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476346 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 19:08:44 +00:00
Vinod Kumar Vavilapalli
141fe2f5e5
YARN-363. Add webapps/proxy directory without which YARN proxy-server fails when started in stand-alone mode. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1476330 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476332 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 18:31:04 +00:00
Vinod Kumar Vavilapalli
27404b1190
YARN-591. Moved RM recovery related records out of public API as they do not belong there. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1476324 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476327 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 18:04:24 +00:00
Suresh Srinivas
14246f3d24
HDFS-4434. Reverting the merge to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475972 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 21:28:51 +00:00
Tsz-wo Sze
874f58b23a
svn merge -c 1475959 from trunk for HADOOP-9503. Remove sleep between IPC client connect timeouts.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475960 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 21:09:04 +00:00
Suresh Srinivas
a51590e1c5
HDFS-4053. Merging change r1399908 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475848 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 16:44:59 +00:00
Suresh Srinivas
e304090117
Cleanup CHANGES.txt to have consistent formatting and match the descrtion with CHANGES.txt in trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475780 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 14:04:12 +00:00
Thomas White
07ab02a982
Merge -r 1475680:1475681 from trunk to branch-2. Fixes: YARN-289. Fair scheduler allows reservations that won't fit on node. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475682 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 09:18:24 +00:00
Thomas White
3bed8dc7b9
Merge -r 1475669:1475670 from trunk to branch-2. Fixes: YARN-595. Refactor fair scheduler to use common Resources. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475672 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 08:36:22 +00:00
Vinod Kumar Vavilapalli
a1fe9a0c9f
YARN-577. Add application-progress also to ApplicationReport. Contributed by Hitesh Shah.
...
MAPREDUCE-5178. Update MR App to set progress in ApplicationReport after YARN-577. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1475636 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475637 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 05:45:15 +00:00