Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,341 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

926 Commits

Author SHA1 Message Date
Chris Nauroth 6bdd4791db MAPREDUCE-5525. Merging change r1526624 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526625 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 17:47:45 +00:00
Colin McCabe fa2a3c94f2 HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 15:24:40 +00:00
Vinod Kumar Vavilapalli 6e132b1a2b MAPREDUCE-5170. Fixed a wrong log message in CombineFileInputFormat class. Contributed by Sangjin Lee. 
svn merge --ignore-ancestry -c 1526377 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526379 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 04:30:36 +00:00
Vinod Kumar Vavilapalli b41137c73a MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526364 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 03:02:06 +00:00
Bikas Saha a5ecb4de41 Merge r1526071 from trunk to branch-2 for MAPREDUCE-5505. Clients should be notified job finished only after job successfully unregistered (Zhijie Shen via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526072 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-25 00:53:10 +00:00
Siddharth Seth e23d5672a7 merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-25 00:37:14 +00:00
Vinod Kumar Vavilapalli 2daddb610e YARN-1204. Added separate configuration properties for https for RM and NM without which servers enabled with https will also start on http ports. Contributed by Omkar Vinit Joshi. 
MAPREDUCE-5523. Added separate configuration properties for https for JHS without which even when https is enabled, it starts on http port itself. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1525947 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525948 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-24 17:20:48 +00:00
Robert Joseph Evans e2bfdfc585 svn merge -c 1525670 FIXES: MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525673 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 18:39:47 +00:00
Vinod Kumar Vavilapalli d71bb8385b YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM registration and finish correctly. Contributed by Omkar Vinit Joshi. 
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1524864 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524867 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 23:51:14 +00:00
Vinod Kumar Vavilapalli d8ed9ef4b8 MAPREDUCE-5488. Changed MR client to keep trying to reach the application when it sees that on attempt's AM is down. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1524856 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524857 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 22:36:58 +00:00
Thomas Graves 11d0fe9722 MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524843 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 21:00:40 +00:00
Sanford Ryza f0e79b8157 MAPREDUCE-5487. In task processes, JobConf is unnecessarily loaded again in Limits (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524417 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 13:58:37 +00:00
Arun Murthy 73c69decf1 Merge -c 1523660 from trunk to branch-2 to fix MAPREDUCE-5493. Cleanup in-memory & on-disk segments to prevent leak on shuffle completion. Contributed by Jason Lowe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523661 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 14:19:33 +00:00
Arun Murthy c061a0da55 Merge -c 1523652 from trunk to branch-2 to fix YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contributed by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523653 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 14:06:27 +00:00
Alejandro Abdelnur 7993c89ea8 MAPREDUCE-5379. Include token tracking ids in jobconf. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523607 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 12:20:30 +00:00
Bikas Saha c5ef30971e Merge r1523376 from trunk to branch-2 for YARN-540. Race condition causing RM to potentially relaunch already unregistered AMs on RM restart (Jian He via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523377 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-15 01:07:11 +00:00
Bikas Saha 87d09e5ebe Merge r1523146 from trunk to branch-2 YARN-1116. Populate AMRMTokens back to AMRMTokenSecretManager after RM restarts (Jian He via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523149 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-13 23:57:56 +00:00
Vinod Kumar Vavilapalli 90f492e532 MAPREDUCE-5497. Changed MRAppMaster to sleep only after doing everything else but just before ClientService to avoid race conditions during RM restart. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1521699 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521700 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-11 00:39:21 +00:00
Thomas Graves a574ef2864 MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521584 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-10 18:53:29 +00:00
Devarajulu K d997ca22f9 MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE. Contributed by Nemon Lou. 
svn merge --ignore-ancestry -c 1520964 ../../trunk



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520965 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-09 06:46:16 +00:00
Jason Darrell Lowe 5ddee655e4 svn merge -c 1520156 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520157 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-04 22:32:35 +00:00
Sanford Ryza ab02296741 HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519130 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-31 02:13:11 +00:00
Sanford Ryza 997e2f4fd3 MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518858 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 23:53:29 +00:00
Vinod Kumar Vavilapalli 7b8795012e MAPREDUCE-5441. Changed MR AM to return RUNNING state if exiting when RM commands to reboot, so that client can continue to track the overall job. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1518821 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518824 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 21:10:54 +00:00
Alejandro Abdelnur 23cbe7af90 MAPREDUCE-5483. revert MAPREDUCE-5357. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518773 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 19:26:31 +00:00
Vinod Kumar Vavilapalli ba89f8efc7 YARN-1085. Addendum patch to address issues with the earlier patch. 
svn merge --ignore-ancestry -c 1517721 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517722 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-26 23:01:23 +00:00
Vinod Kumar Vavilapalli 2d9c88f45e YARN-1074. Cleaned up YARN CLI application list to only display running applications by default. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1517196 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517197 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 21:17:11 +00:00
Vinod Kumar Vavilapalli a42a5e153c YARN-1085. Modified YARN and MR2 web-apps to do HTTP authentication in secure setup with kerberos. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1517101 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517102 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 02:48:17 +00:00
Jason Darrell Lowe 35f60e71de svn merge -c 1517097 to revert MAPREDUCE-5475 and YARN-707 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517098 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 01:23:39 +00:00
Jason Darrell Lowe 25595863d3 svn merge -c 1517085 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517086 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 22:55:45 +00:00
Vinod Kumar Vavilapalli 91d8768381 MAPREDUCE-5476. Changed MR AM recovery code to cleanup staging-directory only after unregistering from the RM. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1516660 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516662 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 23:17:57 +00:00
Chris Nauroth 3ad42fba26 MAPREDUCE-5470. Merging change r1516623 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516625 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 21:43:57 +00:00
Jason Darrell Lowe 8d1cd8ddb7 svn merge -c 1516594 FIXES: Revert MAPREDUCE-5475 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516596 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 20:38:06 +00:00
Arun Murthy b9cee48717 Merge -c 1516361 from trunk to branch-2 to fix MAPREDUCE-5475. Ensure MRClientService verifies ACLs for users. Contributed by Jason Lowe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516362 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 02:00:29 +00:00
Arun Murthy e8268b8a5d Merge -c 1516358 from trunk to branch-2 to fix MAPREDUCE-5468. Fix MR AM recovery for map-only jobs. Contributed by Vinod K. V. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516359 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 01:53:18 +00:00
Vinod Kumar Vavilapalli 83c4906a2e MAPREDUCE-5466. Changed MR AM to not promote history files of intermediate AMs in case they are exiting because of errors and thus help history-server pick up the right history file for the last successful AM. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1516238 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516240 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 18:18:13 +00:00
Luke Lu d83061b71b HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516130 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 10:13:17 +00:00
Jason Darrell Lowe 6f27db80ac svn merge -c 1515863 FIXES: MAPREDUCE-5001. LocalJobRunner has race condition resulting in job failures. Contributed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515877 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 17:00:06 +00:00
Sanford Ryza 0c32694b27 MAPREDUCE-5462. In map-side sort, swap entire meta entries instead of indexes for better cache performance. (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514610 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 08:14:58 +00:00
Alejandro Abdelnur eee2b37a3a HADOOP-9872. Improve protoc version handling and detection. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:29:46 +00:00
Alejandro Abdelnur 677bbd336d HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:25:26 +00:00
Sanford Ryza 0d54ef3b62 MAPREDUCE-5454. TestDFSIO fails intermittently on JDK7 (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513376 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-13 07:12:49 +00:00
Jason Darrell Lowe 432eef4ede svn merge -c 1511464 FIXES: MAPREDUCE-5425. Junit in TestJobHistoryServer failing in jdk 7. Contributed by Robert Parker 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511467 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-07 20:07:15 +00:00
Sanford Ryza 2a7293a254 MAPREDUCE-434. LocalJobRunner limited to single reducer (Sandy Ryza and Aaron Kimball via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510867 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-06 06:40:42 +00:00
Sanford Ryza 75c40235aa MAPREDUCE-5399. Unnecessary Configuration instantiation in IFileInputStream slows down merge. (Stanislav Barton via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510813 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 23:35:03 +00:00
Sanford Ryza 3490c9aab7 MAPREDUCE-5367. Local jobs all use same local working directory (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510612 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 17:12:58 +00:00
Kihwal Lee 7d36680e73 svn merge -c 1510581 Merging from trunk to branch-2 to fix MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510583 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 16:05:04 +00:00
Jason Darrell Lowe b4c28a1aa9 svn merge -c 1509401 FIXES: MAPREDUCE-5428. HistoryFileManager doesn't stop threads when service is stopped. Contributed by Karthik Kambatla 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509404 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-01 20:03:08 +00:00
Siddharth Seth d7f082ad5f merge MAPREDUCE-5352 from trunk. Optimize node local splits generated by CombineFileInputFormat. (sseth) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509346 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-01 17:43:40 +00:00
Vinod Kumar Vavilapalli d00dcbd2f5 MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1508595 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508596 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-30 20:05:19 +00:00
Jason Darrell Lowe 3bd5174a8e svn merge -c 1508220 FIXES: MAPREDUCE-5411. Refresh size of loaded job cache on history server. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508224 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-29 22:48:00 +00:00
Alejandro Abdelnur 126337bba6 YARN-937. Fix unmanaged AM in non-secure/secure setup post YARN-701. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507708 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-27 20:08:59 +00:00
Tsz-wo Sze 3c08e71316 svn merge -c 1507259 from trunk for HADOOP-9756. Remove the deprecated getServer(..) methods from RPC. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507586 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-27 07:01:51 +00:00
Tsz-wo Sze 4c045ebafd svn merge -c 1380921 from trunk for YARN-84. Use Builder to build RPC server. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507582 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-27 06:47:40 +00:00
Jason Darrell Lowe 5df508c539 svn merge -c 1507486 FIXES: MAPREDUCE-5419. TestSlive is getting FileNotFound Exception. Contributed by Robert Parker 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507487 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 22:03:15 +00:00
Vinod Kumar Vavilapalli 6bc4693384 MAPREDUCE-5421. Fixed TestNonExistentJob failure after YARN-873. Contributed by Junping Du. 
svn merge --ignore-ancestry -c 1507401 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507402 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 19:16:08 +00:00
Jason Darrell Lowe f6611d89c8 svn merge -c 1507385 FIXES: MAPREDUCE-1981. Improve getSplits performance by using listLocatedStatus. Contributed by Hairong Kuang and Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507387 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 18:22:00 +00:00
Jason Darrell Lowe fca19f6a8a svn merge -c 1507135 FIXES: MAPREDUCE-5386. Ability to refresh history server job retention and job cleaner settings. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507378 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 17:32:00 +00:00
Jason Darrell Lowe b11cceb25c svn merge -c 1507104 FIXES: MAPREDUCE-5251. Reducer should not implicate map attempt if it has insufficient space to fetch map output. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507105 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-25 19:45:20 +00:00
Alejandro Abdelnur 98eb429771 MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506759 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-24 22:33:59 +00:00
Vinod Kumar Vavilapalli f487f4eb19 YARN-926. Modified ContainerManagerProtcol APIs to take in requests for multiple containers. Contributed by Jian He. 
MAPREDUCE-5412. Update MR app to use multiple containers API of ContainerManager after YARN-926. Contributed by Jian He.
svn merge --ignore-ancestry -c 1506391 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506392 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-24 03:42:52 +00:00
Jason Darrell Lowe d6be90bccf svn merge -c 1506226 FIXES: MAPREDUCE-5356. Ability to refresh aggregated log retention period and check interval. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506230 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-23 19:25:19 +00:00
Colin McCabe 5ff0774e8a HDFS-4817. Make HDFS advisory caching configurable on a per-file basis. (Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506188 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-23 17:54:44 +00:00
Jason Darrell Lowe 673b762364 svn merge -c 1506154 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506157 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-23 16:58:41 +00:00
Jason Darrell Lowe 726533a741 svn merge -c 1505771 FIXES: MAPREDUCE-5404. HSAdminServer does not use ephemeral ports in minicluster mode. Contributed by Ted Yu 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505772 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-22 19:06:07 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-19 01:35:34 +00:00
Arun Murthy f7080007ad Merge -c 1504735 from trunk to branch-2 to fix YARN-918. Remove ApplicationAttemptId from RegisterApplicationMasterRequestProto. Contributed by Vinod K V. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504736 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-19 00:58:33 +00:00
Jason Darrell Lowe 9b1bc20045 svn merge -c 1504645 FIXES: MAPREDUCE-5265. History server admin service to refresh user and superuser group mappings. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504653 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-18 20:47:58 +00:00
Arun Murthy d82a3cd227 Merge -c from trunk to branch-2 to fix YARN-701. Use application tokens irrespective of secure or non-secure mode. Contributed by Vinod K V. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504605 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-18 19:04:37 +00:00
Bikas Saha 41c05101e7 Merge r1503934 from trunk to branch-2 for MAPREDUCE-5398. MR changes for YARN-513 (Jian He via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503936 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-16 22:56:54 +00:00
Jason Darrell Lowe 2386e127b8 svn merge -c 1503744 to revert MAPREDUCE-5317. Stale files left behind for failed jobs 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503747 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-16 15:06:42 +00:00
Jason Darrell Lowe 293d42edf0 svn merge -c 1503499 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503505 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-15 22:30:39 +00:00
Chris Nauroth 9bd8745846 MAPREDUCE-4374. Merging change r1502046 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502048 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-10 23:08:34 +00:00
Hitesh Shah 1157061429 merge -c 1501599 from trunk to branch-2 to fix YARN-727, MAPREDUCE-5325. ClientRMProtocol.getAllApplications should accept ApplicationType as a parameter. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501600 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-09 23:07:15 +00:00
Vinod Kumar Vavilapalli 16841d50c5 YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza. 
svn merge --ignore-ancestry -c 1500994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500995 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-08 22:33:43 +00:00
Chris Nauroth 2a448cc5e7 MAPREDUCE-5366. Merging change r1500842 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500848 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-08 17:17:07 +00:00
Chris Nauroth 81bfd0316e MAPREDUCE-5360. Merging change r1500194 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500195 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-06 03:42:43 +00:00
Jason Darrell Lowe afeff43d7a svn merge -c 1499425 FIXES: MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl. Contributed by Devaraj K 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499426 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-03 14:46:54 +00:00
Chris Nauroth 8c10908e1e MAPREDUCE-5357. Merging change r1499210 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499217 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-03 05:37:34 +00:00
Chris Nauroth 0f3bb0567d MAPREDUCE-5359. Merging change r1499153 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499154 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-03 00:01:28 +00:00
Chris Nauroth 6c703d6ef0 MAPREDUCE-5355. Merging change r1499148 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499149 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-02 23:32:41 +00:00
Jason Darrell Lowe 199485bcdf svn merge -c 1499125 FIXES: MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the input path dir. Contributed by Devaraj K 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499127 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-02 22:00:43 +00:00
Chris Nauroth 5808ba30dd MAPREDUCE-5349. TestClusterMapReduceTestCase and TestJobName fail on Windows in branch-2. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498144 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-30 15:53:29 +00:00
Alejandro Abdelnur 5d45387c00 MAPREDUCE-5333. Add test that verifies MRAM works correctly when sending requests with non-normalized capabilities. (ywskycn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497881 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-28 18:55:31 +00:00
Arun Murthy 2977cbfc83 Merge -c 1496741 from trunk to branch-2 to fix MAPREDUCE-5326. Added version to shuffle header. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496742 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-26 05:50:23 +00:00
Vinod Kumar Vavilapalli 34dfd27833 YARN-851. Share NMTokens using NMTokenCache (api-based) between AMRMClient and NMClient instead of memory based approach which is used currently. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1495247 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495248 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-21 00:09:45 +00:00
Siddharth Seth aa1eba9930 merge MAPREDUCE-5334 from trunk. Fix failing unit tests - TestContainerLauncher, TestContainerLauncherImpl. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494821 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-20 00:36:28 +00:00
Jonathan Turner Eagles d8203c0ae9 MAPREDUCE-5084. fix coverage org.apache.hadoop.mapreduce.v2.app.webapp and org.apache.hadoop.mapreduce.v2.hs.webapp (Aleksey Gorshkov via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494687 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 16:40:20 +00:00
Arun Murthy 6f790ac7ad Merge -c 1494476 from trunk to branch-2 to fix YARN-553. Replaced YarnClient.getNewApplication with YarnClient.createApplication which provides a directly usable ApplicationSubmissionContext to simplify the api. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494477 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 07:07:44 +00:00
Christopher Douglas 6267cddbd6 MAPREDUCE-5194. Heed interrupts during Fetcher shutdown. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494417 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 02:12:20 +00:00
Vinod Kumar Vavilapalli 368c7ae735 YARN-694. Starting to use NMTokens to authenticate all communication with NodeManagers. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1494369 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494370 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 23:20:34 +00:00
Jason Darrell Lowe 20a950a374 MAPREDUCE-5316. job -list-attempt-ids command does not handle illegal task-state. Contributed by Ashwin Shankar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494292 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 20:39:56 +00:00
Vinod Kumar Vavilapalli af90aa5265 YARN-841. Move Auxiliary service to yarn-api, annotate and document it. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1494031 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494032 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 06:23:54 +00:00
Arun Murthy 8ac6ecc7d4 Merge -c 1494027 from trunk to branch-2 to fix YARN-840. Moved ProtoUtils to yarn.api.records.pb.impl. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494029 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 05:59:54 +00:00
Vinod Kumar Vavilapalli 8e9a719712 YARN-834. Fixed annotations for yarn-client module, reorganized packages and clearly differentiated *Async apis. Contributed by Arun C Murthy and Zhijie Shen. 
svn merge --ignore-ancestry -c 1494017 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494018 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 04:03:43 +00:00
Siddharth Seth 5e257b8925 merge YARN-805 from trunk. Fix javadoc and annotations on classes in the yarn-api package. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493993 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 03:14:38 +00:00
Vinod Kumar Vavilapalli c01d820c18 YARN-610. ClientToken is no longer set in the environment of the Containers. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1493968 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493969 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 23:14:15 +00:00
Vinod Kumar Vavilapalli a601f15ebe YARN-822. Renamed ApplicationToken to be AMRMToken, and similarly the corresponding TokenSelector and SecretManager. Contributed by Omkar Vinit Joshi. 
svn merge --ignore-ancestry -c 1493889 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493890 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 19:12:12 +00:00
Vinod Kumar Vavilapalli ce23eea57f YARN-837. Moved yarn.ClusterInfo into MapReduce project as it doesn't belong to YARN. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1493676 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493677 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 08:15:05 +00:00
Vinod Kumar Vavilapalli 04bea5f2fd YARN-833. Moved Graph and VisualizeStateMachine into yarn.state package. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1493654 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493655 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 06:52:39 +00:00