Suresh Srinivas
3694a73ff8
HADOOP-9290. Merge r1476586 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:37:58 +00:00
Suresh Srinivas
0610d2d2d3
HDFS-4741. Merge r1476585 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486151 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:29:50 +00:00
Suresh Srinivas
0af2735024
HDFS-3131. Merge r1305688 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486150 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:26:33 +00:00
Suresh Srinivas
f1f11999d9
HDFS-4732. Merge r1471090 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486146 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:17:52 +00:00
Suresh Srinivas
4a16d5b759
HDFS-4725. Merge r1470771 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486144 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:15:42 +00:00
Suresh Srinivas
57cf1e8fbf
HADOOP-9443. Merge r1470224 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486130 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 17:34:28 +00:00
Suresh Srinivas
5e007776f6
MAPREDUCE-4987. Merge r1470003 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486106 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 16:19:53 +00:00
Suresh Srinivas
de7911b528
HADOOP-8562. Merge r1469996 for HADOOP-9488, r1469998 for YARN-593
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486101 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 16:03:32 +00:00
Suresh Srinivas
a9176a64a1
HDFS-4693. Merge r1468457 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486098 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 15:44:33 +00:00
Suresh Srinivas
91084635f3
MAPREDUCE-4885. Merge r1467158 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485951 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 07:12:07 +00:00
Suresh Srinivas
9b910c5c88
HADOOP-8562. Merge r1464780 HDFS-4625, r1465869 YARN-557, r1466148 HDFS-4674, r1466306 HADOOP-9437, r1466746 YARN-487
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485934 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 05:34:41 +00:00
Suresh Srinivas
0a96ae767f
HADOOP-8562. Merge r1459586 for HDFS-4615, r1459592 for HDFS-4584, r1459643, r1459642 for HADOOP-9387, r1460086 for HADOOP-9353
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485932 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 05:12:56 +00:00
Suresh Srinivas
02205fa797
HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:51:31 +00:00
Vinod Kumar Vavilapalli
004a9d5567
MAPREDUCE-5230. Bring back NLineInputFormat.createFileSplit for binary compatibility with mapred in 1.x Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1485906 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485908 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:42:53 +00:00
Suresh Srinivas
a6c4b42353
HADOP-8662. Merge r1455637 for HADOOP-9388, r1455956 for HDFS-4593, r1456060 for HDFS-4582 and r1457057 for HDFS-4603
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485907 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:42:28 +00:00
Suresh Srinivas
830909a910
HADOOP-8562. Merge changes r1454616 for HDFS-4573, r1454889 for HADOOP-8973, r1455360 for HDFS-4572, r1455605 for HDFS-4287 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485892 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:51:30 +00:00
Vinod Kumar Vavilapalli
4bf02c3be8
YARN-711. Copied BuilderUtil methods in individual API records as BuilderUtils is going to be dismantled. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1485888 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485890 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:48:13 +00:00
Kihwal Lee
7f66f9ccf6
HDFS-4714. Log short messages in Namenode RPC server for exceptions meant for clients. Contributed by Kihwal Lee.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485882 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:28:21 +00:00
Jonathan Turner Eagles
a0a6e7b6fe
YARN-548. Add tests for YarnUncaughtExceptionHandler (Vadim Bondarev via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485879 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:27:19 +00:00
Kihwal Lee
3f9b3d49a3
svn merge -c 1485861 Merging from trunk to branch-2 to fix HDFS-4807.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485863 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:37:32 +00:00
Suresh Srinivas
7ba49c56aa
Merge changes r1453645 for HADOOP-9373, r1453675 for HADOOP-9376, r1453676 for HADOOP-9365, r1454108 for HADOOP-9364.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485853 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:17:38 +00:00
Suresh Srinivas
84b91e1b01
HADOOP-9372. Merge r1453637 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485852 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:09:50 +00:00
Suresh Srinivas
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
Suresh Srinivas
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
Vinod Kumar Vavilapalli
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
Siddharth Seth
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
Siddharth Seth
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Aaron Myers
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
Suresh Srinivas
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Kihwal Lee
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Jason Darrell Lowe
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
Vinod Kumar Vavilapalli
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 1483940
../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483941 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 18:17:57 +00:00
Vinod Kumar Vavilapalli
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
Todd Lipcon
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
Aaron Myers
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
Aaron Myers
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
Robert Joseph Evans
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
Aaron Myers
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
Todd Lipcon
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
Todd Lipcon
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
Todd Lipcon
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