bfd2074a57
svn merge -c 1482661 from trunk for HDFS-3180. Add socket timeouts to WebHdfsFileSystem.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482662 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 02:31:48 +00:00
9ec6c9e018
svn merge -c 1482658 from trunk for HDFS-4813. Add volatile to BlocksMap.blocks so that the replication thread can see the updated value.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482659 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 02:19:24 +00:00
2ed6ce3bfb
MAPREDUCE-5244. Two functions changed their visibility in JobStatus. (zjshen via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482624 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 22:14:15 +00:00
baf4dc8114
HADOOP-9220. Unnecessary transition to standby in ActiveStandbyElector. Contributed by Tom White and Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482402 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 15:37:18 +00:00
4fb60e81e5
HADOOP-9560. Merge change 1482372 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482380 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 15:18:03 +00:00
0e7dec2b39
HADOOP-9307. BufferedFSInputStream.read returns wrong results after certain seeks. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482378 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 15:16:22 +00:00
b30d21bd13
HADOOP-9459. ActiveStandbyElector can join election even before Service HEALTHY, and results in null data at ActiveBreadCrumb. Contributed by Vinay and Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482226 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 06:43:38 +00:00
44a9273286
MAPREDUCE-5222. Bring back some methods and constants in Jobclient for binary compatibility with mapred in 1.x. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1482208 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 05:52:46 +00:00
1f922d3c51
merge YARN-615 from trunk. Rename ContainerLaunchContext.containerTokens to tokens. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482200 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 04:13:00 +00:00
6706e58f61
MAPREDUCE-5240. Fix a bug in MRAppMaster because of which OutputCommitter could not access credentials set by the user. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1482175 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 02:50:27 +00:00
7db8233722
MAPREDUCE-5220. Setter methods in TaskCompletionEvent are public in MR1 and protected in MR2. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482143 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 23:09:05 +00:00
3d615b6573
svn merge -c 1482121. Merging from trunk to branch-2 to fix HDFS-4805.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482122 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 22:06:55 +00:00
3691cf65af
MAPREDUCE-5208. Bug-fix on branch-2 - tests weren't compiling.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482091 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:38:18 +00:00
9c512f83d8
HDFS-4765. Permission check of symlink deletion incorrectly throws UnresolvedLinkException. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482013 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 18:13:44 +00:00
82c75115da
HDFS-4300. TransferFsImage.downloadEditsToStorage should use a tmp file for destination. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481996 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 18:00:33 +00:00
99275f172a
MAPREDUCE-4067. Changed MRClientProtocol api to throw IOException only (Xuan Gong via vinodkv)
...
svn merge --ignore-ancestry -c 1481695 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481696 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 03:36:15 +00:00
621db3a3cc
MAPREDUCE-5208. Modified ShuffleHandler to use SecureIOUtils for reading local files. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1481657 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481658 13f79535-47bb-0310-9956-ffa450edef68
2013-05-12 21:59:48 +00:00
af10c356bc
YARN-590. Added an optional mesage to be returned by ResourceMaanger when RM asks an RM to shutdown/resync etc so that NMs can log this message locally for better debuggability. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1481234 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481235 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 23:38:35 +00:00
0abf49936a
YARN-663. Changed ResourceTracker API and LocalizationProtocol API to throw YarnRemoteException and IOException. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1481215 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481216 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:59:59 +00:00
2482e3270f
HDFS-4533. Merge 1481178 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481211 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:54:27 +00:00
2594db460f
YARN-634. Modified YarnRemoteException to be not backed by PB and introduced a separate SerializedException record. Contributed by Siddharth Seth.
...
MAPREDUCE-5239. Updated MR App to reflect YarnRemoteException changes after YARN-634. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1481205 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:51:32 +00:00
f8b466a1f8
HADOOP-9485. No default value in the code for hadoop.rpc.socket.factory.class.default. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481208 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:49:58 +00:00
bd816a2739
HDFS-4751. TestLeaseRenewer#testThreadName flakes. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481166 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 19:54:27 +00:00
d0ffad0387
svn merge -c 1481084. Merging from trunk to branch-2 to fix HDFS-4799.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481086 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 16:38:27 +00:00
d87e8d26b4
svn merge -c 1481075 Merging from trunk to branch-2 to fix HADOOP-9549.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481077 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 16:25:03 +00:00
211a9d99db
HDFS-4810. several HDFS HA tests have timeouts that are too short. Contributed by Chris Nauroth
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480842 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 00:19:57 +00:00
a88f23aec3
YARN-568. Add support for work preserving preemption to the FairScheduler.
...
Contributed by Carlo Curino and Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480837 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 23:29:38 +00:00
98f63813b4
YARN-598. Add virtual cores to queue metrics. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480817 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 22:24:29 +00:00
de8b9c94a4
YARN-655. Fair scheduler metrics should subtract allocated memory from available memory. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480810 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 22:17:36 +00:00
5d11e610a4
YARN-637. FS: maxAssign is not honored. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480803 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 21:52:43 +00:00
b257aed8bd
YARN-507. Add interface visibility and stability annotations to FS interfaces/classes. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480800 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 21:48:53 +00:00
886b5b6756
HADOOP-9550. Remove aspectj dependency. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480784 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 21:29:25 +00:00
c56c50df3f
MAPREDUCE-4942. mapreduce.Job has a bunch of methods that throw InterruptedException so its incompatible with MR1. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480754 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 20:11:33 +00:00
6aa0edc793
YARN-630. Changed AMRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
MAPREDUCE-5226. Handling YarnRemoteException separately from IOException in MR App's use of AMRMProtocol after YARN-630. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480529 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480530 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 05:32:52 +00:00
fc693ff519
YARN-631. Changed ClientRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
MAPREDUCE-5212. Handling YarnRemoteException separately from IOException in MR App after YARN-631. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480494 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480495 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 22:54:07 +00:00
c175e3f4aa
Fixing release date for 2.0.4-alpha.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480482 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 22:02:00 +00:00
4a0965323c
MAPREDUCE-5157. Bring back old sampler related code so that we can support binary compatibility with hadoop-1 sorter example. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1480474 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480476 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 21:43:40 +00:00
5cf0e57849
MAPREDUCE-5209. Fix units in a ShuffleScheduler log message.
...
Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480472 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 21:36:43 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
Tsz-wo Sze
Alejandro Abdelnur
Todd Lipcon
Suresh Srinivas
Vinod Kumar Vavilapalli
Siddharth Seth
Kihwal Lee
Aaron Myers
Christopher Douglas
Devaraj Das