3eb800f539
HADOOP-9373. Merge change r1453599 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485850 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:07:05 +00:00
a1235b5ba9
HADOOP-8562. Merge r1453486 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 20:41:53 +00:00
35dc9545e1
YARN-563. Add the concept of an application-type for each application. Contributed by Mayank Bansal.
...
MAPREDUCE-5246. Specify application-type at the time of job submission after YARN-563. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1485790 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485792 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 18:02:45 +00:00
01cdcf6eb4
Fixed incorrect jira in CHANGES.txt (YARN-716 to YARN-715)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485585 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 06:01:55 +00:00
9bd8b0c4f1
merge YARN-716 from trunk. Fixed unit test failures - TestDistributedShell and TestUnmanagedAMLauncher. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485580 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 05:49:07 +00:00
28822c2f64
MAPREDUCE-5233. Add methods that are changed or removed from JobControl.Job when compared to 1.x. This breaks 0.23.x users of one API in Job. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1485491 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485494 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 23:13:19 +00:00
6f45ab764e
YARN-708. Deleting files that were supposed to removed in the previous commit.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485482 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 23:07:51 +00:00
356be82fc5
YARN-708. Moved RecordFactory classes to hadoop-yarn-api, and put some miscellaneous fixes to the interfaces. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1485478 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485479 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 22:51:51 +00:00
e30e5becc2
HDFS-4298. StorageRetentionManager spews warnings when used with QJM. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485375 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 19:42:52 +00:00
0a0558014d
HADOOP-8886. Merge r1395820 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485304 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 17:40:27 +00:00
f71593ae2c
MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1485085 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485086 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 06:37:01 +00:00
c28a0860e2
MAPREDUCE-5261. Fix issues in TestRMContainerAllocator after YARN-617. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1485079 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485080 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 06:25:03 +00:00
27d8d51536
YARN-706. Fixed race conditions in TestFSDownload. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1485028 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485029 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 01:51:09 +00:00
89f809bdff
MAPREDUCE-5235. Bring back old fields and exceptions in Counters for binary compatibility with mapred in 1.x. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1484992 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484993 13f79535-47bb-0310-9956-ffa450edef68
2013-05-21 22:01:02 +00:00
623be287b7
HDFS-3875. Issue handling checksum errors in write pipeline. Contributed by Kihwal Lee.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484809 13f79535-47bb-0310-9956-ffa450edef68
2013-05-21 13:45:14 +00:00
35b0a8d69b
YARN-695. Remove masterContainer and status unused fields from ApplicationReportProto and fix bugs in ApplicationReportPBImpl. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1484612 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484613 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 21:51:24 +00:00
543bab20ed
MAPREDUCE-5257. Fix issues in TestContainerLauncherImpl after YARN-617. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1484349 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484351 13f79535-47bb-0310-9956-ffa450edef68
2013-05-19 21:15:54 +00:00
759e518509
svn merge -c 1483974 FIXES: MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific counters page for failed job. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483976 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 20:26:13 +00:00
d180262cf9
MAPREDUCE-5234. Change mapred.TaskReport and mapreduce.TaskReport for binary compatibility with mapred in 1.x but incompatible with 0.23.x. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1483940https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483941 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 18:17:57 +00:00
f0bd8da38b
YARN-617. Made ContainerTokens to be used for validation at NodeManager also in unsecure mode to prevent AMs from faking resource requirements in unsecure mode. Contributed by Omkar Vinit Joshi.
...
Merge from trunk revision 1483667 with little test modifications for proper merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483668 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 06:38:03 +00:00
5fc2beed58
HDFS-4824. FileInputStreamCache.close leaves dangling reference to FileInputStreamCache.cacheCleaner. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483642 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 03:39:22 +00:00
966b4ec5e5
HADOOP-9566. Performing direct read using libhdfs sometimes raises SIGPIPE (which in turn throws SIGABRT) causing client crashes. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483613 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 00:11:11 +00:00
815f2d7236
HDFS-4830. Typo in config settings for AvailableSpaceVolumeChoosingPolicy in hdfs-default.xml. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483604 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 23:23:48 +00:00
59a272eae6
svn merge -c 1483578 FIXES: YARN-690. RM exits on token cancel/renew problems (daryn via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483579 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 21:42:41 +00:00
4069886102
HDFS-4787. Create a new HdfsConfiguration before each TestDFSClientRetries testcases. Contributed by Tian Hong Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483238 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 08:16:07 +00:00
f0c2f42b38
Add HDFS-347 and related JIRAs to CHANGES.txt under 2.0.5
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483213 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:10:46 +00:00
ba594d810e
HDFS-4698. Provide client-side metrics for remote reads, local reads, and short-circuit reads. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483211 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:05:45 +00:00
e3021894e7
HDFS-4661. A few little code cleanups of some HDFS-347-related code. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483210 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:04:12 +00:00
87a1e92453
HDFS-347. DFS read performance suboptimal when client co-located on nodes with data. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:02:57 +00:00
3904614953
YARN-628. Fix the way YarnRemoteException is being unrolled to extract out the underlying exception. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1483207 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483208 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 06:59:19 +00:00
c74b890261
Merged HADOOP-9425
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483146 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 01:38:02 +00:00
47b052810b
Merged HADOOP-9380
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483145 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 01:35:16 +00:00
02c99f3748
Merged HADOOP-9151
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483144 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 01:32:14 +00:00
3c929c9d03
Merged in HADOOP-9163
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483143 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 01:25:30 +00:00
f41b189498
Merged in HADOOP-9218 Document the Rpc-wrappers used internally (sanjay Radia)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483142 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 01:17:43 +00:00
4276dddd0e
svn merge -c 1423189 from trunk for HADOOP-9140 Cleanup rpc PB protos.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483137 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 00:59:47 +00:00
00cad64611
HADOOP-9563. Merge change 1482709 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482710 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 07:47:10 +00:00
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
Suresh Srinivas
Vinod Kumar Vavilapalli
Siddharth Seth
Aaron Myers
Kihwal Lee
Jason Darrell Lowe
Todd Lipcon
Robert Joseph Evans
Sanjay Radia
Tsz-wo Sze
Alejandro Abdelnur