big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,241 Commits 2 Branches 2 Tags 264 MiB
41aa4badf8
Commit Graph

1073 Commits

Author SHA1 Message Date
Jonathan Turner Eagles
9ba98e6af1 MAPREDUCE-5632. TestRMContainerAllocator#testUpdatedNodes fails (jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547929 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-04 22:11:28 +00:00
Jonathan Turner Eagles
5afc1242ea MAPREDUCE-5645. TestFixedLengthInputFormat fails with native libs (Mit Desai via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547624 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-03 22:44:07 +00:00
Arun Murthy
eec0ec2d3f Add ACL check to JHS web-services. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547159 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-02 19:32:17 +00:00
Jonathan Turner Eagles
74851537de MAPREDUCE-5640. Rename TestLineRecordReader in jobclient module (Jason Lowe via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1547149 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-02 19:04:51 +00:00
Jing Zhao
2214871d91 HDFS-5545. Allow specifying endpoints for listeners in HttpServer. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546151 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-27 18:20:14 +00:00
Jason Darrell Lowe
0a5b0499f3 MAPREDUCE-5631. TestJobEndNotifier.testNotifyRetries fails with Should have taken more than 5 seconds in jdk7. Contributed by Jonathan Eagles 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544266 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-21 17:53:39 +00:00
Colin McCabe
efea68dc35 HDFS-5511. improve CacheManipulator interface to allow better unit testing (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543676 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-20 00:48:05 +00:00
Jonathan Turner Eagles
fdad179980 MAPREDUCE-5625. TestFixedLengthInputFormat fails in jdk7 environment (Mariappan Asokan via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542733 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-17 14:29:33 +00:00
Jonathan Turner Eagles
a02e60fefc MAPREDUCE-5373. TestFetchFailure.testFetchFailureMultipleReduces could fail intermittently (jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542456 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 03:29:51 +00:00
Chris Nauroth
88c4d4a714 MAPREDUCE-5616. MR Client-AppMaster RPC max retries on socket timeout is too high. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1542001 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-14 18:09:14 +00:00
Sanford Ryza
3d95049f79 MAPREDUCE-5481. Enable uber jobs to have multiple reducers (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541844 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-14 07:56:11 +00:00
Steve Loughran
01ccd4d3ab MAPREDUCE-5624 Move grizzly-test and junit dependencies to test scope 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541702 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-13 20:46:54 +00:00
Steve Loughran
4a0f804d5e MAPREDUCE-5431 Missing pom dependency in MR-client 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541682 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-13 19:52:43 +00:00
Sanford Ryza
e94ed91114 MAPREDUCE-5613. DefaultSpeculator holds and checks hashmap that is alway empty (Gera Shegalov via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541433 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-13 09:23:18 +00:00
Sanford Ryza
eeda370249 MAPREDUCE-1176. FixedLengthInputFormat and FixedLengthRecordReader (Mariappan Asokan and BitsOfInfo via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540931 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-12 03:06:10 +00:00
Jason Darrell Lowe
38a3b925e9 MAPREDUCE-5186. mapreduce.job.max.split.locations causes some splits created by CombineFileInputFormat to fail. Contributed by Robert Parker and Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540813 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-11 19:22:38 +00:00
Chris Nauroth
bee6822441 MAPREDUCE-5451. MR uses LD_LIBRARY_PATH which doesn't mean anything in Windows. Contributed by Yingda Chen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539413 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-06 18:07:39 +00:00
Colin McCabe
7abf7e8151 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538248 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-02 18:42:27 +00:00
Chris Nauroth
1606a76a54 MAPREDUCE-5604. TestMRAMWithNonNormalizedCapabilities fails on Windows due to exceeding max path length. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1538035 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-01 19:08:43 +00:00
Sanford Ryza
86dc50c1eb MAPREDUCE-5601. ShuffleHandler fadvises file regions as DONTNEED even when fetch fails (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1537855 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-01 08:51:54 +00:00
Bikas Saha
7dd201c541 Fix inadvertent file changes made via r1536888 (bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536894 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-29 21:11:32 +00:00
Bikas Saha
03510d00f4 YARN-1068. Add admin support for HA operations (Karthik Kambatla via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536888 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-29 21:03:54 +00:00
Jason Darrell Lowe
c9643795c1 MAPREDUCE-5598. TestUserDefinedCounters.testMapReduceJob is flakey. Contributed by Robert Kanter 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536724 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-29 14:06:39 +00:00
Jason Darrell Lowe
e0c99b80d4 MAPREDUCE-5596. Allow configuring the number of threads used to serve shuffle connections. Contributed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536711 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-29 13:41:50 +00:00
Sanford Ryza
84cec3c805 MAPREDUCE-4680. Job history cleaner should only check timestamps of files in old enough directories (Robert Kanter via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536558 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-28 23:48:38 +00:00
Jason Darrell Lowe
298bddf00b MAPREDUCE-5561. org.apache.hadoop.mapreduce.v2.app.job.impl.TestJobImpl testcase failing on trunk. Contributed by Karthik Kambatla 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1534832 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-22 22:42:43 +00:00
Jonathan Turner Eagles
2baa42dd01 MAPREDUCE-5587. TestTextOutputFormat fails on JDK7 (jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1533629 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-18 20:57:48 +00:00
Suresh Srinivas
dea1b2e84a HADOOP-10005. No need to check INFO severity level is enabled or not. Contributed by Jackie Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532907 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 21:00:07 +00:00
Sanford Ryza
6a1929fe31 MAPREDUCE-5463. Deprecate SLOTS_MILLIS counters. (Tzuyoshi Ozawa via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531822 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-14 09:11:23 +00:00
Siddharth Seth
f2745babf3 MAPREDUCE-5329. Allow MR applications to use additional AuxServices, which are compatible with the default MapReduce shuffle. Contributed by Avner BenHanoch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531741 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-13 20:17:53 +00:00
Vinod Kumar Vavilapalli
9b9ddf29e2 YARN-1283. Fixed RM to give a fully-qualified proxy URL for an application so that clients don't need to do scheme-mangling. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530819 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 22:49:06 +00:00
Jason Darrell Lowe
00395a0064 MAPREDUCE-5102. fix coverage org.apache.hadoop.mapreduce.lib.db and org.apache.hadoop.mapred.lib.db. Contributed by Aleksey Gorshkov, Andrey Klochkov, and Nathan Roberts 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530816 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 22:39:39 +00:00
Jason Darrell Lowe
7b7caa1e56 MAPREDUCE-5569. FloatSplitter is not generating correct splits. Contributed by Nathan Roberts 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530683 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 15:43:36 +00:00
Daryn Sharp
b858b812b7 HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530667 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 15:09:37 +00:00
Vinod Kumar Vavilapalli
f0799c5536 MAPREDUCE-5562. Fixed MR App Master to perform pending tasks like staging-dir cleanup, sending job-end notification correctly when unregister with RM fails. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529682 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-06 20:53:28 +00:00
Vinod Kumar Vavilapalli
21181b6553 YARN-1277. Added a policy based configuration for http/https in common HttpServer and using the same in YARN - related 
to per project https config support via HADOOP-10022. Contributed by Suresh Srinivas and Omkar Vinit Joshi.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529662 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-06 18:43:36 +00:00
Vinod Kumar Vavilapalli
d4324eef14 MAPREDUCE-5533. Fixed MR speculation code to track any TaskAttempts that aren't heart-beating for a while, so that we can aggressively speculate instead of waiting for task-timeout. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529229 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-04 17:26:56 +00:00
Chris Nauroth
65cd7bf6b1 MAPREDUCE-5442. $HADOOP_MAPRED_HOME/$HADOOP_CONF_DIR setting not working on Windows. Contributed by Yingda Chen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529077 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-04 05:37:54 +00:00
Hitesh Shah
6ff600d9e3 YARN-1131. logs command should return an appropriate error message if YARN application is still running. Contributed by Siddharth Seth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529068 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-04 02:36:17 +00:00
Bikas Saha
fb3f338c65 MAPREDUCE-5489. MR jobs hangs as it does not use the node-blacklisting feature in RM requests (Zhijie Shen via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529005 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-03 21:14:35 +00:00
Jonathan Turner Eagles
7b687dda09 YARN-1199. Make NM/RM Versions Available (Mit Desai via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529003 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-03 21:04:12 +00:00
Sanford Ryza
90a5dc34f7 MAPREDUCE-5554. hdfs-site.xml included in hadoop-mapreduce-client-jobclient tests jar is breaking tests for downstream components (Robert Kanter via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528643 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-02 21:53:57 +00:00
Arun Murthy
3c7813bbad MAPREDUCE-5459. Update documentation on how to run MRv1 examples on YARN. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528626 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-02 21:08:27 +00:00
Arun Murthy
07ee205038 MAPREDUCE-5530. Fix compat with hadoop-1 in mapred.lib.CombinFileInputFormat by re-introducing isSplittable(FileSystem, Path) api and ensuring semantic compatibility. Contributed by Robert Kanter. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528533 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-02 16:08:45 +00:00
Vinod Kumar Vavilapalli
82f4348f27 MAPREDUCE-5536. Fixed MR AM and JHS to respect mapreduce.jobhistory.webapp.https.address. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528251 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 22:52:25 +00:00
Jason Darrell Lowe
db06f1bcb9 MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528237 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 22:34:31 +00:00
Sanford Ryza
cc8a0cab59 MAPREDUCE-5544. JobClient#getJob loads job conf twice. (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528196 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 20:01:20 +00:00
Arun Murthy
9c24615ae6 MAPREDUCE-5551. Fix compat with hadoop-1 in SequenceFileAsBinaryOutputFormat.WritableValueBytes by re-introducing missing constructors. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527848 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 01:24:27 +00:00
Vinod Kumar Vavilapalli
aa12a7914f MAPREDUCE-5538. Fixed MR AppMaster to send job-notification URL only after the job is really done - a bug caused by MAPREDUCE-5505. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527219 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-28 19:14:16 +00:00
Arun Murthy
a40810d267 MAPREDUCE-5529. Fix compat with hadoop-1 in mapred.TotalOrderPartitioner by re-introducing (get,set)PartitionFile which takes in JobConf. Contributed by Robert Kanter. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527048 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 19:42:34 +00:00
Jason Darrell Lowe
711abc3827 MAPREDUCE-5545. org.apache.hadoop.mapred.TestTaskAttemptListenerImpl.testCommitWindow times out. Contributed by Robert Kanter 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527037 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 19:14:07 +00:00
Arun Murthy
58f40d3bf4 MAPREDUCE-5531. Fix compat with hadoop-1 in mapreduce.(TaskID, TaskAttemptID) by re-introducing missing constructors. Contributed by Robert Kanter. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527033 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 19:08:28 +00:00
Jason Darrell Lowe
2627e352d6 MAPREDUCE-5332. Support token-preserving restart of history server. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1527015 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 18:19:41 +00:00
Arun Murthy
96c11fe602 MAPREDUCE-5514. Fix TestRMContainerAllocator. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526735 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 23:02:51 +00:00
Jason Darrell Lowe
cf3d8b2286 MAPREDUCE-5513. ConcurrentModificationException in JobControl. Contributed by Robert Parker 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526688 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 21:10:05 +00:00
Chris Nauroth
7e73b9cde6 MAPREDUCE-5525. Increase timeout of TestDFSIO.testAppend and TestMRJobsWithHistoryService.testJobHistoryData. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526624 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 17:45:14 +00:00
Colin McCabe
8a66e493ba 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/trunk@1526567 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 15:24:30 +00:00
Vinod Kumar Vavilapalli
476eca47b5 MAPREDUCE-5170. Fixed a wrong log message in CombineFileInputFormat class. Contributed by Sangjin Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526377 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 04:30:08 +00:00
Vinod Kumar Vavilapalli
fb48b6cdc9 MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1526362 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 03:00:28 +00:00
Bikas Saha
524dad1109 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/trunk@1526071 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-25 00:46:48 +00:00
Siddharth Seth
10a4289ebf YARN-1229. 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/trunk@1526065 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-25 00:35:03 +00:00
Vinod Kumar Vavilapalli
78e995a37d 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1525947 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-24 17:20:18 +00:00
Robert Joseph Evans
743d8ae055 MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1525670 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 18:33:12 +00:00
Vinod Kumar Vavilapalli
13420d01f2 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1524864 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 23:35:58 +00:00
Vinod Kumar Vavilapalli
af78fd729c 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. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1524856 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 22:35:12 +00:00
Thomas Graves
6b1f5073a7 MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1524841 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 20:58:18 +00:00
Sanford Ryza
c09f00771e 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/trunk@1524408 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 13:44:33 +00:00
Arun Murthy
59587d9fad 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/trunk@1523660 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 14:18:42 +00:00
Arun Murthy
60a1a70197 YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contibuted by Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523652 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 14:04:04 +00:00
Alejandro Abdelnur
e60b057c0a MAPREDUCE-5379. Include token tracking ids in jobconf. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1523605 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 12:17:17 +00:00
Bikas Saha
ec010a2936 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/trunk@1523376 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-15 01:01:06 +00:00
Bikas Saha
f4951e0708 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/trunk@1523146 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-13 23:51:50 +00:00
Vinod Kumar Vavilapalli
1c1ebc1553 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. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1521699 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-11 00:38:49 +00:00
Thomas Graves
75c31df9dd MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1521576 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-10 18:31:50 +00:00
Devarajulu K
b2af6c7024 MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE. Contributed by Nemon Lou. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1520964 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-09 06:42:42 +00:00
Jason Darrell Lowe
5540d77e2f MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1520156 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-04 22:23:40 +00:00
Sanford Ryza
236b8530bd HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1519129 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-31 02:09:45 +00:00
Sanford Ryza
2cc851a66e MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1518857 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 23:45:16 +00:00
Vinod Kumar Vavilapalli
5d4b684c02 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 xJian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1518821 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 21:07:57 +00:00
Alejandro Abdelnur
a29714f077 MAPREDUCE-5483. revert MAPREDUCE-5357. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1518772 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 19:24:41 +00:00
Vinod Kumar Vavilapalli
5adba5597c YARN-1085. Addendum patch to address issues with the earlier patch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1517721 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-26 22:59:09 +00:00
Vinod Kumar Vavilapalli
962da4dcc7 YARN-1074. Cleaned up YARN CLI application list to only display running applications by default. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1517196 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 21:16:40 +00:00
Vinod Kumar Vavilapalli
e86036662c YARN-1085. Modified YARN and MR2 web-apps to do HTTP authentication in secure setup with kerberos. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1517101 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 02:47:47 +00:00
Jason Darrell Lowe
c660339c09 Revert MAPREDUCE-5475 and YARN-707 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1517097 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 01:15:37 +00:00
Jason Darrell Lowe
6f93f20515 MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1517085 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 22:47:37 +00:00
Vinod Kumar Vavilapalli
740f4cb97a MAPREDUCE-5476. Changed MR AM recovery code to cleanup staging-directory only after unregistering from the RM. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516660 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 23:17:12 +00:00
Chris Nauroth
200220e8f3 MAPREDUCE-5470. LocalJobRunner does not work on Windows. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516623 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 21:39:30 +00:00
Jason Darrell Lowe
d2c70e3e94 Revert MAPREDUCE-5475 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516594 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 20:34:46 +00:00
Arun Murthy
148bf3ea4e MAPREDUCE-5475. Ensure MRClientService verifies ACLs for users. Contributed by Jason Lowe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516361 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 01:59:25 +00:00
Arun Murthy
ded91b4cfa 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/trunk@1516358 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 01:52:24 +00:00
Vinod Kumar Vavilapalli
2d614a916c 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. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516238 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 18:16:47 +00:00
Luke Lu
782191f1ba HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1516128 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 10:12:13 +00:00
Jason Darrell Lowe
f7ca7ec4c9 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/trunk@1515863 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 16:41:16 +00:00
Sanford Ryza
cae55de2cd 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/trunk@1514608 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 08:11:04 +00:00
Alejandro Abdelnur
8451ab5c01 HADOOP-9872. Improve protoc version handling and detection. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514068 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:15:04 +00:00
Sanford Ryza
a6ff2270c5 MAPREDUCE-5454. TestDFSIO fails intermittently on JDK7 (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1513368 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-13 07:03:43 +00:00
Alejandro Abdelnur
19b36f0900 HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1513281 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-12 22:15:10 +00:00
Jason Darrell Lowe
c5c90ff8f5 MAPREDUCE-5425. Junit in TestJobHistoryServer failing in jdk 7. Contributed by Robert Parker 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1511464 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-07 20:02:10 +00:00
Sanford Ryza
0cb2fdc3b4 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/trunk@1510866 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-06 06:36:21 +00:00
Sanford Ryza
a00a729729 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/trunk@1510811 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 23:32:33 +00:00
Sanford Ryza
6ea797d0d0 MAPREDUCE-5367. Local jobs all use same local working directory (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1510610 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 17:07:58 +00:00
Kihwal Lee
34ae96fd8c MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions. Contributed by Jason Lowe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1510581 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 16:03:02 +00:00
Jason Darrell Lowe
bfe5a528d8 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/trunk@1509401 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-01 19:57:31 +00:00
Siddharth Seth
381a4c4213 MAPREDUCE-5352. Optimize node local splits generated by CombineFileInputFormat. (sseth) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1509345 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-01 17:42:24 +00:00
Vinod Kumar Vavilapalli
1d915238a6 MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1508595 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-30 20:04:37 +00:00
Jason Darrell Lowe
8bb035509e 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/trunk@1508220 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-29 22:33:45 +00:00
Alejandro Abdelnur
f179afc68d 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/trunk@1507706 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-27 20:04:38 +00:00
Jason Darrell Lowe
7b5aa72d0a MAPREDUCE-5419. TestSlive is getting FileNotFound Exception. Contributed by Robert Parker 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1507486 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 22:01:25 +00:00
Vinod Kumar Vavilapalli
e55d0ef515 MAPREDUCE-5421. Fixed TestNonExistentJob failure after YARN-873. Contributed by Junping Du. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1507401 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 19:15:36 +00:00
Jason Darrell Lowe
ec18984252 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/trunk@1507385 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 18:16:19 +00:00
Tsz-wo Sze
a690a215db HADOOP-9756. Remove the deprecated getServer(..) methods from RPC. Contributed by Junping Du 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1507259 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-26 10:59:20 +00:00
Jason Darrell Lowe
8fa3ebd134 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/trunk@1507135 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-25 21:27:56 +00:00
Jason Darrell Lowe
b9b2647ebc 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/trunk@1507104 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-25 19:38:49 +00:00
Alejandro Abdelnur
c43c763151 MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1506758 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-24 22:31:31 +00:00
Vinod Kumar Vavilapalli
3ca3137179 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1506391 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-24 03:41:03 +00:00
Jason Darrell Lowe
a42e459b9e 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/trunk@1506226 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-23 19:20:57 +00:00
Jason Darrell Lowe
0939c49368 MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1506154 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-23 16:52:24 +00:00
Jason Darrell Lowe
77278064a7 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/trunk@1505771 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-22 19:05:12 +00:00
Colin McCabe
c1314eb2a3 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/trunk@1505753 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-22 18:15:18 +00:00
Arun Murthy
ac914f79bc YARN-918. Remove ApplicationAttemptId from RegisterApplicationMasterRequestProto. Contributed by Vinod K V. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1504735 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-19 00:57:40 +00:00
Jason Darrell Lowe
cc536fe4da 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/trunk@1504645 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-18 20:41:14 +00:00
Arun Murthy
32bc200d54 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/trunk@1504604 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-18 19:03:48 +00:00
Bikas Saha
bf876f70fb MAPREDUCE-5398. MR changes for YARN-513 (Jian He via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503934 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-16 22:51:12 +00:00
Jason Darrell Lowe
44ea6e3ad5 Back out revision 1503499 for MAPREDUCE-5317. Stale files left behind for failed jobs 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503744 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-16 15:05:16 +00:00
Jason Darrell Lowe
8a037edbfb MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503499 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-15 22:24:37 +00:00
Chris Nauroth
413bddf596 MAPREDUCE-4374. Fix child task environment variable config and add support for Windows. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1502046 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-10 22:59:08 +00:00
Hitesh Shah
e2cce7bd26 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/trunk@1501599 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-09 23:01:01 +00:00
Vinod Kumar Vavilapalli
5e4f6ad1d9 YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1500994 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-08 22:30:52 +00:00
Chris Nauroth
4175e41548 MAPREDUCE-5366. TestMRAsyncDiskService fails on Windows. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1500842 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-08 17:07:38 +00:00
Chris Nauroth
e01cbdac25 MAPREDUCE-5360. TestMRJobClient fails on Windows due to path format. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1500194 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-06 03:34:23 +00:00
Jason Darrell Lowe
cf4d0cf189 MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl. Contributed by Devaraj K 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1499425 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-03 14:41:18 +00:00
Chris Nauroth
5b64e3c2be MAPREDUCE-5357. Job staging directory owner checking could fail on Windows. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1499210 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-03 05:15:21 +00:00
Chris Nauroth
06ea8ffcf2 MAPREDUCE-5359. JobHistory should not use File.separator to match timestamp in path. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1499153 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-02 23:57:30 +00:00
Chris Nauroth
f047f9cac6 MAPREDUCE-5355. MiniMRYarnCluster with localFs does not work on Windows. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1499148 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-02 23:19:36 +00:00
Jason Darrell Lowe
e846c98397 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/trunk@1499125 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-02 21:47:17 +00:00
Alejandro Abdelnur
27a50a2bef 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/trunk@1497877 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-28 18:53:19 +00:00
Arun Murthy
11bcd2ed12 MAPREDUCE-5326. Added version to shuffle header. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1496741 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-26 05:49:31 +00:00
Vinod Kumar Vavilapalli
1a06175440 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. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1495247 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-21 00:08:13 +00:00
Siddharth Seth
84862b54aa MAPREDUCE-5334. Fix failing unit tests - TestContainerLauncher, TestContainerLauncherImpl. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1494820 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-20 00:35:51 +00:00
Jonathan Turner Eagles
1ab4659b6b 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/trunk@1494676 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 16:22:12 +00:00
Arun Murthy
d3198dddc8 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/trunk@1494476 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 07:06:54 +00:00
Christopher Douglas
16616f9e5b MAPREDUCE-5194. Heed interrupts during Fetcher shutdown. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1494416 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 02:12:12 +00:00
Vinod Kumar Vavilapalli
243bcd367f YARN-694. Starting to use NMTokens to authenticate all communication with NodeManagers. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1494369 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 23:19:49 +00:00
Jason Darrell Lowe
52fe4e6be9 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/trunk@1494285 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 20:25:00 +00:00
Vinod Kumar Vavilapalli
f4d80e91ae YARN-841. Move Auxiliary service to yarn-api, annotate and document it. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1494031 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 06:20:37 +00:00
Arun Murthy
acc0d3eb52 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/trunk@1494027 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 05:47:54 +00:00
Vinod Kumar Vavilapalli
7ef54faad4 YARN-834. Fixed annotations for yarn-client module, reorganized packages and clearly differentiated *Async apis. Contributed by Arun C Murthy and Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1494017 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 04:02:47 +00:00
Siddharth Seth
2b14656ab5 YARN-805. 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/trunk@1493992 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 03:10:11 +00:00
Vinod Kumar Vavilapalli
5d1b453b85 YARN-610. ClientToken is no longer set in the environment of the Containers. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493968 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 23:13:17 +00:00
Vinod Kumar Vavilapalli
7d0c43d7cf YARN-822. Renamed ApplicationToken to be AMRMToken, and similarly the corresponding TokenSelector and SecretManager. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493889 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 19:11:29 +00:00
Vinod Kumar Vavilapalli
cd30058193 YARN-837. Moved yarn.ClusterInfo into MapReduce project as it doesn't belong to YARN. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493676 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 08:13:48 +00:00
Vinod Kumar Vavilapalli
4662b8b443 YARN-833. Moved Graph and VisualizeStateMachine into yarn.state package. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493654 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 06:51:51 +00:00
Vinod Kumar Vavilapalli
b9efe6bd4a HADOOP-9649. Promoted YARN service life-cycle libraries into Hadoop Common for usage across all Hadoop projects. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493650 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 06:39:33 +00:00
Vinod Kumar Vavilapalli
d4a811edb2 YARN-826. Moved Clock and SystemClock into yarn.util package. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493639 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 04:49:13 +00:00
Arun Murthy
77e134d13f YARN-387. Renamed YARN protocols for consistency. Contributed by Vinod K V. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493623 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 02:27:18 +00:00
Alejandro Abdelnur
789c03438c MAPREDUCE-5171. Expose blacklisted nodes from the MR AM REST API. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493600 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 22:15:37 +00:00
Vinod Kumar Vavilapalli
e3769ea1d2 YARN-829. Renamed RMTokenSelector to be RMDelegationTokenSelector. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493577 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 20:33:30 +00:00
Arun Murthy
7f96128e43 MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493570 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 19:09:48 +00:00
Arun Murthy
98d97d316c YARN-787. Removed minimum resource from RegisterApplicationMasterResponse. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493509 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 13:59:41 +00:00
Arun Murthy
1a389305b2 MAPREDUCE-5192. Allow for alternate resolutions of TaskCompletionEvents. Contributed by Chris Douglas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493445 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-16 03:07:12 +00:00
Vinod Kumar Vavilapalli
c2d0cf1b20 YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in FinishApplicationMasterRequest for consistency. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493315 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-15 04:57:04 +00:00
Alejandro Abdelnur
079ed1c9e1 MAPREDUCE-5310. MRAM should not normalize allocation request capabilities. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493207 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 19:06:50 +00:00
Vinod Kumar Vavilapalli
fdc9412a81 YARN-806. Moved ContainerExitStatus from yarn.api to yarn.api.records. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493138 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 16:10:37 +00:00
Arun Murthy
2166fa201e MAPREDUCE-5319. Set user.name in job.xml. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492962 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 06:26:55 +00:00
Vinod Kumar Vavilapalli
c0cd68d8fb YARN-773. Moved YarnRuntimeException from package api.yarn to api.yarn.exceptions. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492903 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 23:25:14 +00:00
Jason Darrell Lowe
8dc0d5af43 MAPREDUCE-4019. -list-attempt-ids is not working. Contributed by Ashwin Shankar, Devaraj K, and B Anil Kumar 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492868 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 21:01:37 +00:00
Vinod Kumar Vavilapalli
b64572b06b MAPREDUCE-5199. Removing ApplicationTokens file as it is no longer needed. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492848 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 20:20:33 +00:00
Vinod Kumar Vavilapalli
0928502029 YARN-530. Defined Service model strictly, implemented AbstractService for robust subclassing and migrated yarn-common services. Contributed by Steve Loughran. 
YARN-117. Migrated rest of YARN to the new service model. Contributed by Steve Louhran.
MAPREDUCE-5298. Moved MapReduce services to YARN-530 stricter lifecycle. Contributed by Steve Loughran.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492718 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 15:54:38 +00:00
Chris Nauroth
b090bc1c21 MAPREDUCE-5259. TestTaskLog fails on Windows because of path separators missmatch. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492364 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 18:54:56 +00:00
Alejandro Abdelnur
c9fce677b3 MAPREDUCE-5304. mapreduce.Job killTask/failTask/getTaskCompletionEvents methods have incompatible signature changes. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1492360 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 18:47:33 +00:00
Jason Darrell Lowe
c0737b0bdb MAPREDUCE-5308. Shuffling to memory can get out-of-sync when fetching multiple compressed map outputs. Contributed by Nathan Roberts 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1491611 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-10 21:39:34 +00:00
Alejandro Abdelnur
d00d968c49 MAPREDUCE-5312. TestRMNMInfo is failing. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1491043 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-08 19:40:59 +00:00
Bikas Saha
9fcfbf5f51 YARN-759. Create Command enum in AllocateResponse (bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490470 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-06 23:33:48 +00:00
Bikas Saha
2051fd5ee2 YARN-750. Allow for black-listing resources in YARN API and Impl in CS (acmurthy via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490392 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-06 18:46:59 +00:00
Vinod Kumar Vavilapalli
66de4ccf60 YARN-724. Moved ProtoBase from api.records to api.records.impl.pb. Contributed by Jian He. 
MAPREDUCE-5303. Changed MR app after moving ProtoBase to package impl.pb via YARN-724. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489658 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 22:43:19 +00:00
Vinod Kumar Vavilapalli
978012b9b6 YARN-755. Renamed AllocateResponse.reboot to AllocateResponse.resync. Contributed by Bikas Saha. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489295 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 05:53:47 +00:00
Vinod Kumar Vavilapalli
5c097a134e YARN-635 and MAPREDUCE-5301. Bug fix as the committed patch ended up being stale. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489287 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 04:41:55 +00:00
Vinod Kumar Vavilapalli
a83fb61ac0 YARN-635. Renamed YarnRemoteException to YarnException. Contributed by Siddharth Seth. 
MAPREDUCE-5301. Updated MR code to work with YARN-635 changes of renaming YarnRemoteException to YarnException. Contributed by Siddharth Seth


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489283 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 04:05:50 +00:00
Jason Darrell Lowe
78daceaea4 MAPREDUCE-5283. Over 10 different tests have near identical implementations of AppContext. Committed by Sandy Ryza 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489271 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 01:50:15 +00:00
Vinod Kumar Vavilapalli
d33534c4fb YARN-748. Moved BuilderUtils from yarn-common to yarn-server-common for eventual retirement. Contributed by Jian He. 
MAPREDUCE-5297. Updated MR App since BuilderUtils is no longer public after YARN-748. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489257 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 00:34:18 +00:00
Arun Murthy
72e1568be3 MAPREDUCE-5245. Added back constants to JobConf to fix incompatibilities. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489236 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:56:33 +00:00
Arun Murthy
78331cfeca MAPREDUCE-5300. Fix backward incompatibility for o.a.h.mapreduce.filecache.DistributedCache. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489227 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 23:42:28 +00:00
Arun Murthy
1caf3e363f MAPREDUCE-5296. Fix backward incompatibility for JobControl by adding the omitted addJob. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489219 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 22:54:48 +00:00
Arun Murthy
0add6b4edc MAPREDUCE-5220. Fix backward incompatibility for TaskCompletionEvent by adding back setTaskID. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489187 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 21:35:04 +00:00
Thomas White
9a3379f6b1 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/trunk@1489060 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 16:53:13 +00:00
Jason Darrell Lowe
ac44e0a0d0 MAPREDUCE-5268. Improve history server startup performance. Contributed by Karthik Kambatla 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1489012 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 14:46:30 +00:00
Siddharth Seth
a2205a3b72 YARN-720 and MAPREDUCE-5291. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488829 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 02:35:34 +00:00
Arun Murthy
f27e484636 YARN-749. Rename ResourceRequest.(get,set)HostName to ResourceRequest.(get,set)ResourceName. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488806 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-02 22:53:58 +00:00
Vinod Kumar Vavilapalli
05cdca070e MAPREDUCE-5274. Bring back SecureShuffleUtils.toHex in mapreduce for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488625 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:21:43 +00:00
Vinod Kumar Vavilapalli
8267117e10 MAPREDUCE-5229. Put back FileOutputCommitter.TEMP_DIR_NAME in mapreduce for binary compatibility with 1.x APIs. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488621 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 22:10:42 +00:00
Vinod Kumar Vavilapalli
a2c4233004 YARN-717. Put object creation factories for Token in the class itself and remove useless derivations for specific tokens. Contributed by Jian He. 
MAPREDUCE-5289. Updated MR App to use Token directly after YARN-717. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488616 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 21:43:17 +00:00
Vinod Kumar Vavilapalli
a77030abdc MAPREDUCE-5280. Bring back removed constructor and a method in mapreduce ClusterMetrics for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488458 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 03:57:40 +00:00
Vinod Kumar Vavilapalli
b8e9f06774 MAPREDUCE-5273. Bring back a couple of protected variables in mapred and mapreduce CombineFileRecordReader for binary compatibility with 1.x APIs. Contributed by Mayank Bansal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488442 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 00:33:49 +00:00
Siddharth Seth
39f019f413 YARN-735. Make ApplicationAttemptId, ContainerId and NodeId immutable. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488439 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 00:14:31 +00:00
Vinod Kumar Vavilapalli
b65e7ed920 MAPREDUCE-5231. Bring back a constructor in mapred's DBInputFormat.DBRecordReader for binary compatibility with 1.x mapred APIs. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488436 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 23:56:28 +00:00
Vinod Kumar Vavilapalli
73b88956f5 MAPREDUCE-5275. Bring back a couple of APIs in mapreduce.security.TokenCache for binary compatibility with 1.x mapreduce APIs. Contributed by Mayank Bansal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488369 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 19:48:03 +00:00
Christopher Douglas
0a452a30ab MAPREDUCE-5176. Add annotation for tagging tasks as responsive to 
preemption. Contributed by Carlo Curino, cdouglas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488103 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 06:07:18 +00:00
Siddharth Seth
f3f7a11336 MAPREDUCE-5286. Change MapReduce to use ContainerTokenIdentifier instead of the entire Container in the startContainer call - YARN-684. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488087 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:17:33 +00:00
Vinod Kumar Vavilapalli
4394e5edb0 MAPREDUCE-5228. Bring back FileInputFormat.Counter and FileOuputFormat.Counter for binary compatibility with 1.x mapred APIs. Contributed by Mayank Bansal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488060 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 23:53:21 +00:00
Vinod Kumar Vavilapalli
131bfc91a6 MAPREDUCE-5261. Reverting the patch as it is no longer needed. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1488032 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 21:53:34 +00:00