big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,084 Commits 2 Branches 2 Tags 264 MiB
56dc7773f8
Commit Graph

639 Commits

Author SHA1 Message Date
Sanford Ryza
5109157ed1 MAPREDUCE-5130. Add missing job config options to mapred-default.xml (Ray Chiang via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619626 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 23:28:44 +00:00
Jason Darrell Lowe
da4ba50269 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619604 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 21:38:16 +00:00
Karthik Kambatla
e5e9d792c7 MAPREDUCE-5974. Allow specifying multiple MapOutputCollectors with fallback. (Todd Lipcon via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619492 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 17:37:34 +00:00
Allen Wittenauer
ef32d09030 [post-HADOOP-9902] mapred version is missing (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619201 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:47:10 +00:00
Andrew Wang
d2a39b61aa Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619018 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 01:22:42 +00:00
Andrew Wang
0cc08f6da4 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618700 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:41:31 +00:00
Karthik Kambatla
73325f23f6 MAPREDUCE-6012. DBInputSplit creates invalid ranges on Oracle. (Wei Yan via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618694 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:25:50 +00:00
Zhijie Shen
f8e871d01b MAPREDUCE-6024. Shortened the time when Fetcher is stuck in retrying before concluding the failure by configuration. Contributed by Yunjiong Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618677 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 17:57:48 +00:00
Jason Darrell Lowe
7378af7bca MAPREDUCE-5878. some standard JDK APIs are not part of system classes defaults. Contributed by Sangjin Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618080 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 23:17:33 +00:00
Allen Wittenauer
2d904b3fa3 MAPREDUCE-5906. Inconsistent configuration in property "mapreduce.reduce.shuffle.input.buffer.percent" (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618007 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 18:07:06 +00:00
Allen Wittenauer
e1f15d2cdf MAPREDUCE-5999. Fix dead link in InputFormat javadoc (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618003 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 17:56:53 +00:00
Allen Wittenauer
7557f7bb2d MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617995 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 17:18:14 +00:00
Allen Wittenauer
6be98091f7 MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617994 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 17:11:39 +00:00
Allen Wittenauer
92054f2a06 MAPREDUCE-5597. Missing alternatives in javadocs for deprecated constructors in mapreduce.Job (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617986 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 16:00:18 +00:00
Allen Wittenauer
e7b540eced MAPREDUCE-5363. Fix doc and spelling for TaskCompletionEvent#getTaskStatus and getStatus (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617982 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 15:49:10 +00:00
Allen Wittenauer
1e016e6451 MAPREDUCE-4791. Javadoc for KeyValueTextInputFormat should include default separator and how to change it (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617979 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 15:43:28 +00:00
Allen Wittenauer
b3df973adb MAPREDUCE-883. harchive: Document how to unarchive (Akira AJISAKA and Koji Noguchi via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617977 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 15:39:52 +00:00
Allen Wittenauer
e51a5d691b MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617806 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 19:34:26 +00:00
Charles Lamb
041b8326a1 MAPREDUCE-6007. Add support to distcp to preserve raw.* namespace extended attributes. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616657 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 01:32:18 +00:00
Charles Lamb
1d3e9ec935 merge from trunk r1613787 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1613788 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-27 13:32:51 +00:00
Zhijie Shen
549bcc2c02 MAPREDUCE-6002. Made MR task avoid reporting error to AM when the task process is shutting down. Contributed by Wangda Tan. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613743 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-27 01:37:51 +00:00
Andrew Wang
cb20bb6117 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612403 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 21:44:50 +00:00
Jason Darrell Lowe
c2174a5536 MAPREDUCE-5756. CombineFileInputFormat.getSplits() including directories in its results. Contributed by Jason Dere 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612400 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 21:24:15 +00:00
Andrew Wang
56c0bd4d37 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610853 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-15 21:10:24 +00:00
Vinod Kumar Vavilapalli
b60ef8b91b MAPREDUCE-5790. Made it easier to enable hprof profile options by default. Contributed by Gera Shegalov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610578 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-15 04:49:01 +00:00
Alejandro Abdelnur
95986dd2fb MAPREDUCE-5890. Support for encrypting Intermediate data and spills in local filesystem. (asuresh via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609597 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 00:43:03 +00:00
Vinod Kumar Vavilapalli
1355ff6132 MAPREDUCE-5830. Added back the private API HostUtil.getTaskLogUrl(..) for binary compatibility with older clients like Hive 0.13. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604230 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 18:28:21 +00:00
Karthik Kambatla
7b9c074b76 MAPREDUCE-5844. Add a configurable delay to reducer-preemption. (Maysam Yabandeh via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603957 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 17:22:56 +00:00
Karthik Kambatla
bd23a2ff22 MAPREDUCE-5896. InputSplits should indicate which locations have the block cached in memory. (Sandy Ryza via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603670 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 23:28:50 +00:00
Chris Nauroth
180ac8dc1d MAPREDUCE-5912. Task.calculateOutputSize does not handle Windows files after MAPREDUCE-5196. Contributed by Remus Rusanu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602282 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 20:02:45 +00:00
Karthik Kambatla
fc7c8f9bf2 HADOOP-10686. Writables are not always configured. (Abraham Elmahrek via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1602079 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 07:23:20 +00:00
Chris Nauroth
473e83ab71 MAPREDUCE-5920. Add Xattr option in DistCp docs. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601983 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 18:36:06 +00:00
Karthik Kambatla
40ba8c17c1 MAPREDUCE-5777. Support utf-8 text with Byte Order Marker. (Zhihai Xu via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1600977 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 18:37:03 +00:00
Chris Nauroth
806f4d11f2 HADOOP-10602. Documentation has broken "Go Back" hyperlinks. Contributed by Akira AJISAKA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598337 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 17:26:50 +00:00
Devarajulu K
61c59c0704 MAPREDUCE-5895. Close streams properly to avoid leakage in TaskLog. Contributed by Kousuke Saruta. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598209 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 07:05:26 +00:00
Jason Darrell Lowe
4bb4de93d6 MAPREDUCE-5862. Line records longer than 2x split size aren't handled correctly. Contributed by bc Wong 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598111 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 19:37:52 +00:00
Jason Darrell Lowe
1f8bb1001a MAPREDUCE-5309. 2.0.4 JobHistoryParser can't parse certain failed job history files generated by 2.0.3 history server. Contributed by Rushabh S Shah 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1596295 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 15:46:54 +00:00
Ravi Prakash
c9377189a0 MAPREDUCE 5874. Creating MapReduce REST API section. Contributed by Tsuyoshi Ozawa 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1595265 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 16:50:58 +00:00
Christopher Douglas
5bf7ef839b MAPREDUCE-5821. Avoid unintentional reallocation of byte arrays in segments 
during merge. Contributed by Todd Lipcon


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1594654 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-14 17:51:11 +00:00
Karthik Kambatla
f3c3d9e0c6 MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1594329 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 19:10:48 +00:00
Jason Darrell Lowe
b0e80d1a47 MAPREDUCE-5814. fat jar with *-default.xml may fail when mapreduce.job.classloader=true. Contributed by Gera Shegalov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1594326 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 18:55:05 +00:00
Jonathan Turner Eagles
7fe28fc8f9 MAPREDUCE-5636. Convert MapReduce Tutorial document to APT (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592795 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 16:17:16 +00:00
Jonathan Turner Eagles
bd54137afa MAPREDUCE-5637. Convert Hadoop Streaming document to APT (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592789 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 16:01:21 +00:00
Jonathan Turner Eagles
693025a3d4 MAPREDUCE-5638. Port Hadoop Archives document to trunk (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1591107 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 21:23:50 +00:00
Jason Darrell Lowe
bb7ce82816 MAPREDUCE-5812. Make job context available to OutputCommitter.isRecoverySupported(). Contributed by Mohammad Kamrul Islam 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1590668 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-28 15:18:02 +00:00
Jonathan Turner Eagles
a059eadbe9 MAPREDUCE-5639. Port DistCp2 document to trunk (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1590058 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 15:23:42 +00:00
Chris Nauroth
06c15b6a3e MAPREDUCE-5852. Prepare MapReduce codebase for JUnit 4.11. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1589006 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 23:44:41 +00:00
Jonathan Turner Eagles
28d62bf75b MAPREDUCE-3191. docs for map output compression incorrectly reference SequenceFile (Chen He via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1588009 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-16 18:14:53 +00:00
Haohui Mai
8ca32df08e HADOOP-10474. Move o.a.h.record to hadoop-streaming. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585886 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 04:02:46 +00:00
Sanford Ryza
d28be56239 MAPREDUCE-5759. Remove unnecessary conf load in Limits (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583497 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-01 00:16:45 +00:00
Vinod Kumar Vavilapalli
6015e95941 MAPREDUCE-5795. Fixed MRAppMaster to record the correct job-state after it recovers from a commit during a previous attempt. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1581180 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 02:00:39 +00:00
Chris Nauroth
a90a5c2452 MAPREDUCE-5791. Shuffle phase is slow in Windows - FadviseFileRegion::transferTo does not read disks efficiently. Contributed by Nikola Vujic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1580994 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 18:57:52 +00:00
Vinod Kumar Vavilapalli
a5c08eed16 MAPREDUCE-5787. Added the ability to keep alive shuffle connections in the MapReduce shuffle-handler. Contributed by Rajesh Balamohan. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1580062 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-21 21:43:55 +00:00
Vinod Kumar Vavilapalli
396c6c63a2 MAPREDUCE-2349. Modified FileInputFormat to be able to issue file and block location calls in parallel. Contributed by Siddharth Seth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1579515 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-20 02:46:23 +00:00
Vinod Kumar Vavilapalli
96e0ca2d27 YARN-1824. Improved NodeManager and clients to be able to handle cross platform application submissions. Contributed by Jian He. 
MAPREDUCE-4052. Improved MapReduce clients to use NodeManagers' ability to handle cross platform application submissions. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1578135 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-16 18:32:05 +00:00
Jonathan Turner Eagles
aab466558a MAPREDUCE-5456. TestFetcher.testCopyFromHostExtraBytes is missing (Jason Lowe via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577313 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-13 20:48:06 +00:00
Jonathan Turner Eagles
2c6ce77c5a MAPREDUCE-5713. InputFormat and JobConf JavaDoc Fixes (Chen He via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577239 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-13 16:49:27 +00:00
Vinod Kumar Vavilapalli
98ecd4ffef MAPREDUCE-5028. Fixed a bug in MapTask that was causing mappers to fail when a large value of io.sort.mb is set. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1576170 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-11 01:29:56 +00:00
Jason Darrell Lowe
a756de93ef MAPREDUCE-5773. Provide dedicated MRAppMaster syslog length limit. Contributed by Gera Shegalov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573775 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 22:02:18 +00:00
Jason Darrell Lowe
658b1bf561 MAPREDUCE-5754. Preserve Job diagnostics in history. Contributed by Gera Shegalov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572269 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 21:32:34 +00:00
Jason Darrell Lowe
08e6d312e8 MAPREDUCE-5757. ConcurrentModificationException in JobControl.toList. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569038 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-17 16:14:58 +00:00
Vinod Kumar Vavilapalli
990cffdcfa YARN-1553. Modified YARN and MR to stop using HttpConfig.isSecure() and 
instead rely on the http policy framework. And also fix some bugs related
to https handling in YARN web-apps. Contributed by Haohui Mai.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568501 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 20:01:02 +00:00
Jason Darrell Lowe
c122ef9000 MAPREDUCE-5670. CombineFileRecordReader should report progress when moving to the next file. Contributed by Chen He 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1568118 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-13 23:16:00 +00:00
Karthik Kambatla
308f5faf18 MAPREDUCE-5746. Job diagnostics can implicate wrong task for a failed job. (Jason Lowe via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567666 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-12 16:04:18 +00:00
Karthik Kambatla
4594b74b85 MAPREDUCE-5699. Allow setting tags on MR jobs (kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565384 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-06 18:29:30 +00:00
Sanford Ryza
f51c7ebe75 Add missing file for MAPREDUCE-5732 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562642 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-29 23:53:13 +00:00
Sanford Ryza
db80705719 MAPREDUCE-5732. Report proper queue when job has been automatically placed (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562641 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-29 23:51:40 +00:00
Sanford Ryza
2a20fe8370 MAPREDUCE-5464. Add analogs of the SLOTS_MILLIS counters that jive with the YARN resource model (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562216 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 20:15:18 +00:00
Suresh Srinivas
33a47743a5 HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in branch-2 for compatibility. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561959 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-28 07:32:52 +00:00
Jason Darrell Lowe
d1963ad4bd MAPREDUCE-5693. Restore MRv1 behavior for log flush. Contributed by Gera Shegalov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560148 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-21 19:23:34 +00:00
Sanford Ryza
f667371746 MAPREDUCE-5650. Job fails when hprof mapreduce.task.profile.map/reduce.params is specified (Gera Shegalov via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559201 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-17 17:43:00 +00:00
Jason Darrell Lowe
a6ea460a91 MAPREDUCE-5672. Provide optional RollingFileAppender for container log4j (syslog). Contributed by Gera Shegalov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558948 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-16 22:56:09 +00:00
Alejandro Abdelnur
0c591a624d MAPREDUCE-3310. Addendum fixing javadocs warnings (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556063 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-06 23:21:08 +00:00
Alejandro Abdelnur
76238b9722 MAPREDUCE-3310. Custom grouping comparator cannot be set for Combiners (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555968 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-06 18:35:26 +00:00
Vinod Kumar Vavilapalli
b524501d4f MAPREDUCE-5685. Fixed a bug with JobContext getCacheFiles API inside the WrappedReducer class. Contributed by Yi Song. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554320 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-30 21:14:46 +00:00
Christopher Douglas
47cca0cb6d MAPREDUCE-5196. Add bookkeeping for managing checkpoints of task state. 
Contributed by Carlo Curino


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1553939 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-28 21:58:33 +00:00
Christopher Douglas
9ca394d54d MAPREDUCE-5189. Add policies and wiring to respond to preemption requests 
from YARN. Contributed by Carlo Curino.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551748 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-17 22:54:31 +00:00
Christopher Douglas
9218b4aec1 MAPREDUCE-5197. Add a service for checkpointing task state. 
Contributed by Carlo Curino


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551726 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-17 21:37:25 +00:00
Jason Darrell Lowe
18d99c12c3 MAPREDUCE-5656. bzip2 codec can drop records when reading data in splits. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1549705 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-09 23:31:30 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
982753dc8e YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth. 
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487994 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 20:18:39 +00:00
Vinod Kumar Vavilapalli
a720a524e9 MAPREDUCE-5263. Bring back old methods and fields in filecache.DistributedCache for binary compatibility with mapred in 1.x. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487695 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 01:23:16 +00:00
Vinod Kumar Vavilapalli
0edae7a96a MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into 2.x so as to be compatible with 1.x. Contributed by Zhijie Shen. 
Incompatible as ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so breaks 0.23.x but it shouldn't be a big deal in reality.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487175 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 00:43:13 +00:00
Vinod Kumar Vavilapalli
a791527dd1 MAPREDUCE-5230. Bring back NLineInputFormat.createFileSplit for binary compatibility with mapred in 1.x Contributed by Mayank Bansal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485906 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 00:42:22 +00:00
Vinod Kumar Vavilapalli
43876770d9 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.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485790 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 18:02:04 +00:00
Vinod Kumar Vavilapalli
9b284150f1 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. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485491 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 23:12:45 +00:00
Vinod Kumar Vavilapalli
6377bfc505 MAPREDUCE-5235. Bring back old fields and exceptions in Counters for binary compatibility with mapred in 1.x. Contributed by Mayank Bansal 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1484992 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-21 22:00:08 +00:00
Hitesh Shah
6517c3f714 MAPREDUCE-5191. TestQueue#testQueue fails with timeout on Windows. (Contributed by Ivan Mitic) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1484575 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-20 20:02:07 +00:00
Vinod Kumar Vavilapalli
0b668c21b2 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. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1483940 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-17 18:16:33 +00:00
Vinod Kumar Vavilapalli
4d8e350750 MAPREDUCE-5232. Add a configuration to be able to log classpath and other system properties on mapreduce JVMs startup. Contributed by Sangjin Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482643 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 23:43:53 +00:00
Alejandro Abdelnur
3472800eb6 MAPREDUCE-5244. Two functions changed their visibility in JobStatus. (zjshen via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482622 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 22:12:40 +00:00
Vinod Kumar Vavilapalli
febf951220 MAPREDUCE-5222. Bring back some methods and constants in Jobclient for binary compatibility with mapred in 1.x. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482208 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 05:52:11 +00:00
Alejandro Abdelnur
2103c80b77 MAPREDUCE-5220. Setter methods in TaskCompletionEvent are public in MR1 and protected in MR2. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1482142 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 23:08:10 +00:00
Vinod Kumar Vavilapalli
47d1ca402f MAPREDUCE-5208. Modified ShuffleHandler to use SecureIOUtils for reading local files. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481657 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-12 21:59:16 +00:00
Alejandro Abdelnur
d303f01297 MAPREDUCE-4942. mapreduce.Job has a bunch of methods that throw InterruptedException so its incompatible with MR1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480748 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 20:04:32 +00:00
Vinod Kumar Vavilapalli
f6167ef6c6 MAPREDUCE-5157. Bring back old sampler related code so that we can support binary compatibility with hadoop-1 sorter example. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480474 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 21:42:47 +00:00
Christopher Douglas
67d7d8f4d3 MAPREDUCE-5209. Fix units in a ShuffleScheduler log message. 
Contributed by Tsuyoshi OZAWA


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480464 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 21:12:27 +00:00
Vinod Kumar Vavilapalli
8888d3fc49 MAPREDUCE-5159. Change ValueAggregatorJob to add APIs which can support binary compatibility with hadoop-1 examples. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480394 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 18:28:22 +00:00
Thomas White
9b97df9abe 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@1478422 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 15:58:53 +00:00
Vinod Kumar Vavilapalli
71be8ad325 MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs inline with YARN. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477889 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-01 00:42:32 +00:00
Suresh Srinivas
8f7ce62085 MAPREDUCE-5177. Use common utils FileUtil#setReadable/Writable/Executable & FileUtil#canRead/Write/Execute. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1477403 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 23:00:39 +00:00
Arun Murthy
40e78c2ca2 MAPREDUCE-4737. Ensure that mapreduce APIs are semantically consistent with mapred API w.r.t Mapper.cleanup and Reducer.cleanup; in the sense that cleanup is now called even if there is an error. The old mapred API already ensures that Mapper.close and Reducer.close are invoked during error handling. Note that it is an incompatible change, however end-users can override Mapper.run and Reducer.run to get the old (inconsistent) behaviour. Contributed by Arun C. Murthy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471556 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 17:38:43 +00:00
Robert Joseph Evans
0777474cc2 MAPREDUCE-5069. add concrete common implementations of CombineFileInputFormat (Sangjin Lee via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471424 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 14:11:50 +00:00
Vinod Kumar Vavilapalli
27e8c86999 YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong. 
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471156 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-23 21:39:51 +00:00
Arun Murthy
794f9bb3e4 MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470216 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-20 19:18:24 +00:00
Alejandro Abdelnur
e222d1e783 MAPREDUCE-4932. mapreduce.job#getTaskCompletionEvents incompatible with Hadoop 1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469587 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-18 21:42:03 +00:00
Alejandro Abdelnur
d12c463121 MAPREDUCE-4898. FileOutputFormat.checkOutputSpecs and FileOutputFormat.setOutputPath incompatible with MR1. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469523 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-18 18:51:45 +00:00
Alejandro Abdelnur
cd27afa71a MAPREDUCE-5128. mapred-default.xml is missing a bunch of history server configs. (sandyr via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469095 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 23:14:34 +00:00
Thomas Graves
9ea20fc537 MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey Gorshkov via tgraves) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1468483 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-16 16:11:35 +00:00
Robert Joseph Evans
947e97f354 MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1468232 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-15 21:33:47 +00:00
Vinod Kumar Vavilapalli
3c8bd60616 MAPREDUCE-5094. Disabled memory monitoring by default in MiniMRYarnCluster to avoid some downstream tests failing. Contributed by Siddharth Seth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467124 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 22:54:02 +00:00
Siddharth Seth
6a1c41111e MAPREDUCE-5079. Changes job recovery to restore state directly from job history, instaed of simulating state machine events. Contributed by Jason Lowe and Robert Parker. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466767 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-11 04:52:38 +00:00
Arun Murthy
7f13207ed1 MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. Contributed by Billie Rinaldi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465188 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-06 05:30:56 +00:00
Konstantin Boudnik
d18cc69d4e MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is submitting a job (daryn) 
merge -c1463804 from branch-2.0.4-alpha



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464153 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-03 18:45:15 +00:00
Robert Joseph Evans
6f0c4dca74 Reverted MAPREDUCE-4974 because of test failures. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463359 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 02:13:18 +00:00
Robert Joseph Evans
b55756dd03 MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463221 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-01 17:45:07 +00:00
Siddharth Seth
d41e67b966 MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461251 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 18:15:40 +00:00
Robert Joseph Evans
a0a844222d MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461146 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-26 14:16:13 +00:00
Vinod Kumar Vavilapalli
46315a2d91 MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by *Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460923 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-25 22:33:43 +00:00
Alejandro Abdelnur
c19633da5b Reverting MAPREDUCE-5028 (commit 1457918) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1458433 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 17:56:29 +00:00
Jonathan Turner Eagles
523d3daac0 MAPREDUCE-5053. java.lang.InternalError from decompression codec cause reducer to fail (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1458350 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 15:45:35 +00:00
Alejandro Abdelnur
53e7aaa6dd MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457918 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-18 18:56:40 +00:00
Robert Joseph Evans
7d7553c4eb MAPREDUCE-5042. Reducer unable to fetch for a map task that was recovered (Jason Lowe via bobby) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1457119 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-15 21:09:25 +00:00
Jason Darrell Lowe
57803245ec MAPREDUCE-5060. Fetch failures that time out only count against the first map task. Contributed by Robert Joseph Evans 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455740 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-12 22:51:28 +00:00
Arun Murthy
df68c56267 MAPREDUCE-3685. Fix bugs in MergeManager to ensure compression codec is appropriately used and that on-disk segments are correctly sorted on file-size. Contributed by Anty Rao and Ravi Prakash. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453365 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 15:02:45 +00:00
Jonathan Turner Eagles
e1062b8b78 MAPREDUCE-5027. Shuffle does not limit number of outstanding connections (Robert Parker via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453098 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 00:03:41 +00:00