big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,312 Commits 2 Branches 2 Tags 264 MiB
d8d3d538e4
Commit Graph

662 Commits

Author SHA1 Message Date
Andrew Wang
6b53802cba Update project version to 3.0.0-alpha1-SNAPSHOT. 2016-05-12 11:05:05 -07:00
Robert Kanter
ecce3b7d53 MAPREDUCE-6677. LocalContainerAllocator doesn't specify resource of the containers allocated (haibochen via rkanter) 2016-05-04 22:19:20 -07:00
Harsh J
7da5847cf1 MAPREDUCE-2398. MRBench: setting the baseDir parameter has no effect. Contributed by Michael Noll and Wilfred Spiegelenburg. 2016-04-21 17:53:51 +05:30
Allen Wittenauer
0a74610d1c HADOOP-11393. Revert HADOOP_PREFIX, go back to HADOOP_HOME (aw) 2016-03-31 07:51:05 -07:00
Akira Ajisaka
690d8a368d MAPREDUCE-6663. [NNBench] Refactor nnbench as a Tool implementation. Contributed by Brahma Reddy Battula. 2016-03-30 11:42:54 +09:00
Akira Ajisaka
0050fa5f1c MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote. 2016-03-29 18:17:52 +09:00
Rohith Sharma K S
0ef8bbfd87 MAPREDUCE-6662. Clear ASF Warnings on test data files. Contributed by Vinayakumar B 2016-03-29 10:32:21 +08:00
Akira Ajisaka
115be193df Revert "MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote." 
This reverts commit 2c268cc936.
 2016-03-28 16:05:35 +09:00
Akira Ajisaka
2c268cc936 MAPREDUCE-6543. Migrate MR client test cases part 2. Contributed by Dustin Cote. 2016-03-25 15:17:27 +09:00
Akira Ajisaka
368c77376a MAPREDUCE-6656. [NNBench] OP_DELETE operation isn't working after MAPREDUCE-6363. Contributed by J.Andreina. 2016-03-23 23:22:43 +09:00
Akira Ajisaka
0bfe5a0167 MAPREDUCE-6580. Test failure: TestMRJobsWithProfiler. Contributed by Eric Badger. 2016-03-23 13:18:06 +09:00
Wangda Tan
6529c87551 MAPREDUCE-6579. JobStatus#getFailureInfo should not output diagnostic information when the job is running. (Akira AJISAKA via wangda) 2016-03-15 17:28:40 -07:00
Akira Ajisaka
247a790609 MAPREDUCE-6520. Migrate MR Client test cases part 1. Contributed by Dustin Cote. 2016-03-11 22:51:20 +09:00
Akira Ajisaka
6876b9f9f9 Revert "MAPREDUCE-6520. Migrate MR Client test cases part 1." 
This reverts commit ef68b44195.
 2016-03-11 22:50:57 +09:00
Akira Ajisaka
ef68b44195 MAPREDUCE-6520. Migrate MR Client test cases part 1. 2016-03-11 22:20:55 +09:00
Robert Kanter
4343a4cf77 MAPREDUCE-6640. mapred job -history command should be able to take Job ID (rkanter) 2016-02-23 17:37:49 -08:00
Tsuyoshi Ozawa
b68901d7dd YARN-4708. Missing default mapper type in TimelineServer performance test tool usage. Contributed by Kai Sasaki. 2016-02-22 07:54:53 +09:00
Robert Kanter
8eee59ce6b MAPREDUCE-6627. Add machine-readable output to mapred job -history command (rkanter) 2016-02-18 17:58:26 -08:00
Wangda Tan
9875325d5c YARN-4340. Add list API to reservation system. (Sean Po via wangda) 2016-02-02 10:17:33 +08:00
Jason Lowe
59a212b6e1 MAPREDUCE-6618. YarnClientProtocolProvider leaking the YarnClient thread. Contributed by Xuan Gong 2016-02-01 16:05:06 +00:00
Karthik Kambatla
d40859fab1 YARN-4526. Make SystemClock singleton so AppSchedulingInfo could use it. (kasha) 2016-01-18 10:58:14 +01:00
Akira Ajisaka
7b0964f354 MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple mappers. Contributed by Vlad Sharanhovich and Bibin A Chundatt. 2016-01-14 10:40:22 +09:00
Sangjin Lee
f6f16118d3 MAPREDUCE-6577. MR AM unable to load native library without MR_AM_ADMIN_USER_ENV set (sjlee) 2016-01-05 15:22:50 -08:00
Jian He
85c2466048 YARN-4164. Changed updateApplicationPriority API to return the updated application priority. Contributed by Rohith Sharma K S 2015-12-18 14:13:48 -08:00
Jason Lowe
f634505d48 MAPREDUCE-5870. Support for passing Job priority through Application Submission Context in Mapreduce Side. Contributed by Sunil G 2015-11-24 22:07:26 +00:00
Haohui Mai
000e12f6fa HDFS-9153. Pretty-format the output for DFSIO. Contributed by Kai Zheng. 2015-11-22 16:18:07 -08:00
Sangjin Lee
9ad708a0df MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee) 2015-11-11 15:37:24 -08:00
Akira Ajisaka
04d97f8abb MAPREDUCE-6525. Fix test failure of TestMiniMRClientCluster.testRestart. Contributed by Masatake Iwasaki. 2015-11-03 01:50:07 +09:00
Xuan
7412ff48ee YARN-4313. Race condition in MiniMRYarnCluster when getting history 
server address. Contributed by Jian He
 2015-10-29 17:36:36 -07:00
Tsuyoshi Ozawa
96677bef00 YARN-3573. MiniMRYarnCluster constructor that starts the timeline server using a boolean should be marked deprecated. Contributed by Brahma Reddy Battula. 2015-10-27 12:35:01 +09:00
Junping Du
eb6379ca25 MAPREDUCE-6508. TestNetworkedJob fails consistently due to delegation token changes on RM. Contributed by Akira AJISAKA 2015-10-23 10:05:46 -07:00
Sangjin Lee
58590fef49 YARN-2556. Tool to measure the performance of the timeline server (Chang Li via sjlee) 2015-10-16 16:53:20 -07:00
Jason Lowe
a0bca2b5ad YARN-261. Ability to fail AM attempts. Contributed by Andrey Klochkov and Rohith Sharma K S 2015-10-09 14:17:38 +00:00
Xuan
8f08532bde YARN-1897. CLI and core support for signal container functionality. Contributed by Ming Ma 2015-10-02 18:50:47 -07:00
Haohui Mai
602335dfe6 MAPREDUCE-6483. Replace deprecated method NameNode.getUri() with DFSUtilClient.getNNUri() in TestMRCredentials. Contributed by Mingliang Liu. 2015-09-18 13:36:09 -07:00
Haohui Mai
941001bfa6 MAPREDUCE-6477. Replace usage of deprecated NameNode.DEFAULT_PORT in TestFileSystem. Contributed by Mingliang Liu. 2015-09-16 13:06:26 -07:00
Jason Lowe
62943b8e3a MAPREDUCE-6472. MapReduce AM should have java.io.tmpdir=./tmp to be consistent with tasks. Contributed by Naganarasimha G R 2015-09-15 19:43:20 +00:00
Andrew Wang
e1feaf6db0 HADOOP-12358. Add -safely flag to rm to prompt when deleting many files. Contributed by Xiaoyu Yao. 2015-09-04 13:42:55 -07:00
Akira Ajisaka
00804e2457 Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple mappers. Contributed by Brahma Reddy Battula." 
This reverts commit 75a2560e51.
 2015-09-02 12:22:16 +09:00
Zhihai Xu
cbb249534a MAPREDUCE-6452. NPE when intermediate encrypt enabled for LocalRunner. Contributed by Zhihai Xu 2015-08-28 12:13:23 -07:00
Jian He
57c7ae1aff YARN-4014. Support user cli interface in for Application Priority. Contributed by Rohith Sharma K S 2015-08-24 20:36:44 -07:00
Jason Lowe
aa5b15b03b MAPREDUCE-6413. TestLocalJobSubmission is failing with unknown host. Contributed by zhihai xu 2015-06-25 19:50:07 +00:00
Akira Ajisaka
445b13240c MAPREDUCE-6403. Fix typo in the usage of NNBench. Contributed by Jagadesh Kiran N. 2015-06-22 15:32:39 +09:00
Akira Ajisaka
85cc644f92 MAPREDUCE-6396. TestPipeApplication fails by NullPointerException. Contributed by Brahma Reddy Battula. 2015-06-15 15:28:31 -07:00
Akira Ajisaka
75a2560e51 MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple mappers. Contributed by Brahma Reddy Battula. 2015-06-15 14:52:26 -07:00
Zhijie Shen
bc85959edd Revert "YARN-1462. Made RM write application tags to timeline server and exposed them to users via generic history web UI and REST API. Contributed by Xuan Gong." 
This reverts commit 4a9ec1a824.
 2015-06-03 14:15:56 -07:00
Zhijie Shen
4a9ec1a824 YARN-1462. Made RM write application tags to timeline server and exposed them to users via generic history web UI and REST API. Contributed by Xuan Gong. 2015-05-30 21:05:36 -07:00
Wangda Tan
3164e7d838 MAPREDUCE-6304. Specifying node labels when submitting MR jobs. (Naganarasimha G R via wangda) 2015-05-27 14:26:03 -07:00
Tsuyoshi Ozawa
b27ce3c531 MAPREDUCE-6204. TestJobCounters should use new properties instead of JobConf.MAPRED_TASK_JAVA_OPTS. 2015-05-22 23:29:53 +09:00
Wangda Tan
563eb1ad2a YARN-3583. Support of NodeLabel object instead of plain String in YarnClient side. (Sunil G via wangda) 2015-05-19 16:54:38 -07:00
Vinod Kumar Vavilapalli
6b710a42e0 Fixing MR intermediate spills. Contributed by Arun Suresh. 2015-05-14 16:07:56 -07:00
Vinod Kumar Vavilapalli
f24452d14e MAPREDUCE-6251. Added a new config for JobClient to retry JobStatus calls so that they don't fail on history-server backed by DFSes with not so strong guarantees. Contributed by Craig Welch. 2015-05-12 12:11:42 -07:00
Jason Lowe
444836b3dc MAPREDUCE-5465. Tasks are often killed before they exit on their own. Contributed by Ming Ma 2015-05-11 22:37:35 +00:00
Ravi Prakash
5aab014340 MAPREDUCE-4750. Enable NNBenchWithoutMR in MapredTestDriver (Liang Xie and Jason Lowe via raviprak) 2015-05-08 15:56:29 -07:00
Jason Lowe
30099a36c6 MAPREDUCE-5248. Let NNBenchWithoutMR specify the replication factor for its test. Contributed by Erik Paulson 2015-05-08 22:29:47 +00:00
Devaraj K
2401ff76be MAPREDUCE-6342. Make POM project names consistent. Contributed by Rohith. 2015-05-08 15:17:52 +05:30
Akira Ajisaka
d335071398 MAPREDUCE-6356. Misspelling of threshold in log4j.properties for tests. Contributed by Brahma Reddy Battula. 2015-05-07 19:39:24 +09:00
Tsuyoshi Ozawa
551615fa13 MAPREDUCE-6165. [JDK8] TestCombineFileInputFormat failed on JDK8. Contributed by Akira AJISAKA. 2015-05-05 10:23:13 +09:00
Akira Ajisaka
ac281e3fc8 HADOOP-11627. Remove io.native.lib.available. Contributed by Brahma Reddy Battula. 2015-04-24 08:08:55 +09:00
Vinod Kumar Vavilapalli
f5fe35e297 YARN-3413. Changed Nodelabel attributes (like exclusivity) to be settable only via addToClusterNodeLabels but not changeable at runtime. (Wangda Tan via vinodkv) 2015-04-23 11:19:55 -07:00
Gera Shegalov
725eb52ddc MAPREDUCE-6293. Set job classloader on uber-job's LocalContainerLauncher event thread. (Sangjin Lee via gera) 2015-04-21 13:57:22 -07:00
Robert Kanter
d50e8f0928 MAPREDUCE-6238. MR2 can't run local jobs with -libjars command options which is a regression from MR1 (zxu via rkanter) 2015-04-20 14:14:08 -07:00
Jian He
577d755e4b YARN-3348. Add a 'yarn top' tool to help understand cluster usage. Contributed by Varun Vasudev 2015-04-10 09:57:17 -07:00
Harsh J
c91b2de68a MAPREDUCE-6314. TestPipeApplication fails on trunk. Contributed by Varun Vasudev. 2015-04-10 14:02:26 +05:30
Hitesh Shah
265ed1fe80 YARN-2890. MiniYarnCluster should turn on timeline service if configured to do so. Contributed by Mit Desai. 2015-04-08 14:13:10 -07:00
Akira Ajisaka
c770df49b4 MAPREDUCE-6292. Use org.junit package instead of junit.framework in TestCombineFileInputFormat. (aajisaka) 2015-03-25 19:00:35 +09:00
Tsuyoshi Ozawa
4170c99147 MAPREDUCE-6285. ClientServiceDelegate should not retry upon AuthenticationException. Contributed by Jonathan Eagles. 2015-03-25 00:56:26 +09:00
Harsh J
7a678db3ac MAPREDUCE-6239. Consolidate TestJobConf classes in hadoop-mapreduce-client-jobclient and hadoop-mapreduce-client-core. Contributed by Varun Saxena. 2015-03-21 09:43:29 +05:30
Akira Ajisaka
8041267f02 MAPREDUCE-4424. 'mapred job -list' command should show the job name as well. Contributed by Avinash Kujur. 2015-03-20 18:46:51 +09:00
Jonathan Eagles
8180e676ab YARN-3267. Timelineserver applies the ACL rules after applying the limit on the number of records (Chang Li via jeagles) 2015-03-13 12:04:30 -05:00
Tsuyoshi Ozawa
20b8ee1350 MAPREDUCE-4742. Fix typo in nnbench#displayUsage. Contributed by Liang Xie. 2015-03-11 00:41:12 +09:00
Junping Du
d39bc903a0 Configurable timeout between YARNRunner terminate the application and forcefully kill. Contributed by Eric Payne. 2015-03-10 06:21:59 -07:00
Tsuyoshi Ozawa
9ae7f9eb7b MAPREDUCE-5657. Fix Javadoc errors caused by incorrect or illegal tags in doc comments. Contributed by Akira AJISAKA. 2015-03-03 18:06:26 +09:00
Tsuyoshi Ozawa
d1c6accb6f HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa) 2015-03-03 14:17:52 +09:00
Karthik Kambatla
1047c883ba MAPREDUCE-6223. TestJobConf#testNegativeValueForTaskVmem failures. (Varun Saxena via kasha) 2015-02-26 14:24:19 -08:00
Tsuyoshi Ozawa
9cedad11d8 Revert "HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa)" 
This reverts commit 946456c6d8.

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/QuotaByStorageTypeEntry.java
 2015-02-25 00:32:04 +09:00
Wangda Tan
d49ae725d5 YARN-3076. Add API/Implementation to YarnClient to retrieve label-to-node mapping (Varun Saxena via wangda) 2015-02-19 11:00:57 -08:00
Plamen Jeliazkov
a19820f2fb MAPREDUCE-6228. Add truncate operation to SLive. Constributed by Plamen Jeliazkov. 2015-02-19 00:02:49 -08:00
Tsuyoshi Ozawa
946456c6d8 HADOOP-11602. Fix toUpperCase/toLowerCase to use Locale.ENGLISH. (ozawa) 2015-02-19 13:06:53 +09:00
Tsuyoshi Ozawa
7c782047c6 MAPREDUCE-4286. TestClientProtocolProviderImpls passes on failure conditions. Contributed by Devaraj K. 2015-02-18 15:45:52 +09:00
yliu
ef01768333 MAPREDUCE-6227. DFSIO for truncate. (shv via yliu) 2015-02-08 02:43:43 +08:00
Robert Kanter
e2ee2ff7d7 MAPREDUCE-6233. org.apache.hadoop.mapreduce.TestLargeSort.testLargeSort failed in trunk (zxu via rkanter) 2015-02-05 14:20:28 -08:00
Akira Ajisaka
bd69fb2d44 MAPREDUCE-5800. Use Job#getInstance instead of deprecated constructors. (aajisaka) 2015-02-03 14:30:09 -08:00
Brandon Li
09d31bc630 HADOOP-9992. Modify the NN loadGenerator to optionally run as a MapReduce job. Contributed by Akshay Radia 2015-01-09 17:24:22 -08:00
Robert Kanter
390a7c12f5 MAPREDUCE-6199. AbstractCounters are not reset completely on deserialization (adhoot via rkanter) 2014-12-19 15:43:48 -08:00
Robert Kanter
d9e4d67d18 MAPREDUCE-6045. need close the DataInputStream after open it in TestMapReduce.java (zxu via rkanter) 2014-12-19 11:59:22 -08:00
Eric Yang
c379e102dd MAPREDUCE-6191. Improve clearing stale state of Java serialization 
testcase.  (Sam Liu via Eric Yang)
 2014-12-15 19:39:41 -08:00
Jian He
a4f2995b9e Revert "YARN-2890. MiniYARNCluster should start the timeline server based on the configuration. Contributed by Mit Desai." 
This reverts commit 51af8d367d.

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-12-15 11:04:09 -08:00
Harsh J
cb99f43305 MAPREDUCE-5420. Remove mapreduce.task.tmp.dir from mapred-default.xml. Contributed by James Carman. (harsh) 2014-12-11 09:45:49 +05:30
Jason Lowe
03ab24aa01 MAPREDUCE-5932. Provide an option to use a dedicated reduce-side shuffle log. Contributed by Gera Shegalov 2014-12-03 17:02:14 +00:00
Zhijie Shen
51af8d367d YARN-2890. MiniYARNCluster should start the timeline server based on the configuration. Contributed by Mit Desai. 2014-12-01 19:04:04 -08:00
Arun C. Murthy
43cd07b408 YARN-2830. Add backwords compatible ContainerId.newInstance constructor. Contributed by Jonathan Eagles. 2014-11-09 14:57:37 -08:00
Jason Lowe
10f9f5101c MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov 2014-11-06 15:10:40 +00:00
Jian He
73068f677b MAPREDUCE-6048. Fixed TestJavaSerialization failure. Contributed by Varun Vasudev 2014-11-04 20:19:54 -08:00
Haohui Mai
d794f785de HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter. 2014-11-04 17:52:03 -08:00
Zhijie Shen
ed63b11646 MAPREDUCE-6052. Supported overriding the default container-log4j.properties file per job. Contributed by Junping Du. 2014-11-01 00:47:57 -07:00
Vinod Kumar Vavilapalli
e0233c16eb YARN-2698. Moved some node label APIs to be correctly placed in client protocol. Contributed by Wangda Tan. 2014-10-30 22:59:31 -07:00
Vinod Kumar Vavilapalli
3f1441245d MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and TestMRTimelineEventHandling. Contributed by Zhijie Shen. 2014-10-29 09:57:39 -07:00
Zhijie Shen
971e91c8c0 MAPREDUCE-6018. Added an MR specific config to enable emitting job history data to the timeline server. Contributed by Robert Kanter. 2014-10-27 21:03:53 -07:00
Zhijie Shen
6b2f11b54b MAPREDUCE-5933. Enabled MR AM to post history events to the timeline server. Contributed by Robert Kanter. 2014-10-27 20:35:40 -07:00
Jason Lowe
209b1699fc MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in client. Contributed by Rohith 2014-10-17 19:51:10 +00:00
Jian He
0af1a2b5bc YARN-2312. Deprecated old ContainerId#getId API and updated MapReduce to use ContainerId#getContainerId instead. Contributed by Tsuyoshi OZAWA 2014-10-15 15:22:07 -07:00
Jason Lowe
f19771a24c MAPREDUCE-5970. Provide a boolean switch to enable MR-AM profiling. Contributed by Gera Shegalov 2014-10-15 17:50:31 +00:00
Jason Lowe
793dbf2465 MAPREDUCE-6115. TestPipeApplication#testSubmitter fails in trunk. Contributed by Binglin Chang 2014-10-13 16:04:14 +00:00
Karthik Kambatla
e8a31f2e1c MAPREDUCE-5875. Make Counter limits consistent across JobClient, MRAppMaster, and YarnChild. (Gera Shegalov via kasha) 2014-10-11 22:49:06 -07:00
cnauroth
777877d079 MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth. 2014-10-09 22:35:58 -07:00
subru
3f282762d1 MAPREDUCE-6103.Adding reservation APIs to MR resource manager delegate. Contributed by Subru Krishnan and Carlo Curino. 
(cherry picked from commit aa92dd45f2d8c89a8a17ad2e4449aa3ff08bc53a)
 2014-10-03 15:42:59 -07:00
Jason Lowe
23fbfe36c3 MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk. Contributed by Akira AJISAKA 2014-09-29 18:12:59 +00:00
Jason Lowe
cf4631d7c9 HADOOP-11049. javax package system class default is too broad. Contributed by Sangjin Lee 2014-09-29 14:36:29 +00:00
Allen Wittenauer
c7c8e388a9 MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw) 2014-09-26 14:25:49 -07:00
Jason Lowe
7039b98e1c MAPREDUCE-6095. Enable DistributedCache for uber-mode Jobs. Contributed by Gera Shegalov 2014-09-22 15:20:59 +00:00
Jason Lowe
951847ba94 MAPREDUCE-6091. YARNRunner.getJobStatus() fails with ApplicationNotFoundException if the job rolled off the RM view. Contributed by Sangjin Lee 2014-09-19 20:15:54 +00:00
Karthik Kambatla
52945a33cc MAPREDUCE-6086. mapreduce.job.credentials.binary should allow all URIs. (Zhihai Xu via kasha) 2014-09-18 15:46:52 -07:00
Vinod Kumar Vavilapalli
14e2639fd0 YARN-611. Added an API to let apps specify an interval beyond which AM failures should be ignored towards counting max-attempts. Contributed by Xuan Gong. 2014-09-13 18:04:05 -07:00
Jason Lowe
15366d9227 MAPREDUCE-5931. Validate SleepJob command line parameters. Contributed by Gera Shegalov 2014-08-29 19:50:15 +00:00
Chris Douglas
48aa3b7274 Fix typos in log messages. Contributed by Ray Chiang 2014-08-28 16:29:35 -07:00
Jason Lowe
812bd0c0e5 MAPREDUCE-5885. build/test/test.mapred.spill causes release audit warnings. Contributed by Chen He 2014-08-27 15:14:54 +00:00
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
Andrew Wang
311d2f0773 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616589 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 20:26:52 +00:00
Jason Darrell Lowe
de2595833c MAPREDUCE-6021. MR AM should have working directory in LD_LIBRARY_PATH. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616585 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 20:15:56 +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
Jason Darrell Lowe
9e62bcca4e MAPREDUCE-5957. AM throws ClassNotFoundException with job classloader enabled if custom output format/committer is used. Contributed by Sangjin Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612358 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 17:54:46 +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
Chris Nauroth
286ae1edd0 MAPREDUCE-5866. TestFixedLengthInputFormat fails in windows. Contributed by Varun Vasudev. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608585 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-07 19:56:44 +00:00
Vinod Kumar Vavilapalli
d85f90e5b3 MAPREDUCE-5868. Fixed an issue with TestPipeApplication that was causing the nightly builds to fail. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608579 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-07 19:45:57 +00:00
Jason Darrell Lowe
e2c18809d3 MAPREDUCE-5884. History server uses short user name when canceling tokens. Contributed by Mohammad Kamrul Islam 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1593422 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-08 21:22:26 +00:00
Uma Maheswara Rao G
0931bd94be HDFS-6246. Remove 'dfs.support.append' flag from trunk code. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1589927 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 05:19:50 +00:00
Vinod Kumar Vavilapalli
e33ba5d944 MAPREDUCE-5843. Fixed TestMRKeyValueTextInputFormat to not leak files and thus avoid failing on Windows. Contributed by Varun Vasudev. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1589533 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 22:54:26 +00:00
Chris Nauroth
1dfc9c39b6 MAPREDUCE-5827. TestSpeculativeExecutionWithMRApp fails. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1589223 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-22 18:17:54 +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
Chris Nauroth
c482cb253c MAPREDUCE-5642. TestMiniMRChildTask fails on Windows. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1588605 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-19 04:07:22 +00:00
Devarajulu K
14fee881fd MAPREDUCE-5775. Remove unnecessary job.setNumReduceTasks in SleepJob.createJob. Contributed by jhanver chand sharma. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1587831 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-16 08:32:44 +00:00
Jonathan Turner Eagles
161d97807f MAPREDUCE-5836. Fix typo in RandomTextWriter (Akira AJISAKA via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1587716 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-15 20:33:28 +00:00
Vinod Kumar Vavilapalli
6351ee2a78 MAPREDUCE-5828. Fixed a test issue with TestMapReduceJobControl that was causing it to fail on Windows. Contributed by Vinod Kumar Vavilapalli. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1587089 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-13 19:55:32 +00:00
Vinod Kumar Vavilapalli
05fd3bbe48 MAPREDUCE-5824. Fixed test-failure of TestPipesNonJavaInputFormat in Windows. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1586368 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 16:44:04 +00:00
Steve Loughran
b8f250a99d HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1585932 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 11:11:20 +00:00
Haohui Mai
fb1d7fb596 HDFS-5570. Deprecate hftp / hsftp and replace them with webhdfs / swebhdfs. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1584100 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-02 17:28:08 +00:00
Arun Murthy
b7b3a7e011 MAPREDUCE-5813. Fix YarnChild to explicitly load job.xml from the local-filesystem, rather than rely on the classpath. Contributed by Gera Shegalov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1583050 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-29 19:14:53 +00:00
Kihwal Lee
767a98aa92 MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout. Contributed by Mit Desai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1579995 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-21 17:57:09 +00:00
Jing Zhao
0b3ee72af8 HDFS-6090. Use MiniDFSCluster.Builder instead of deprecated constructors. Contributed by Akira AJISAKA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1578669 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-17 23:53:48 +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
Arpit Agarwal
763b8ebf46 MAPREDUCE-5794. SliveMapper always uses default FileSystem. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577281 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-13 18:55:29 +00:00
Zhijie Shen
6af044bb75 YARN-1389. Made ApplicationClientProtocol and ApplicationHistoryProtocol expose analogous getApplication(s)/Attempt(s)/Container(s) APIs. Contributed by Mayank Bansal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577052 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-13 07:42:29 +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
Tsz-wo Sze
8d49acf0e9 MAPREDUCE-5780. SliveTest should use the specified path to get the particular FileSystem instead of using the default FileSystem. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575049 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 21:26:51 +00:00
Haohui Mai
9192f8446d HDFS-6058. Fix TestHDFSCLI failures after HADOOP-8691 change. Contributed by Akira Ajisaka and Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574792 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 08:13:40 +00:00
Vinod Kumar Vavilapalli
88245b6a41 YARN-986. Changed client side to be able to figure out the right RM Delegation token for the right ResourceManager when HA is enabled. Contributed by Karthik Kambatla. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1574190 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 20:39:06 +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
77910d4fe3 MAPREDUCE-5768. TestMRJobs.testContainerRollingLog fails on trunk. Contributed by Gera Shegalov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573035 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 19:22:01 +00:00
Karthik Kambatla
9bdd272fd7 MAPREDUCE-5665. Add audience annotations to MiniMRYarnCluster and MiniMRCluster. (Anubhav Dhoot via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572795 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 00:52:30 +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
Sanford Ryza
c79cc3a314 YARN-1497. Command line additions for moving apps between queues (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1565754 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-07 18:35:44 +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
Vinod Kumar Vavilapalli
cbee889711 YARN-321. Merging YARN-321 branch to trunk. 
svn merge ../branches/YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561452 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-26 04:51:10 +00:00
Sanford Ryza
362e4fc891 MAPREDUCE-5725. Make explicit that TestNetworkedJob relies on the Capacity Scheduler (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559882 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-21 01:23:44 +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
Sanford Ryza
67cbde3008 YARN-1496. Protocol additions to allow moving apps between queues (Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559050 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-17 08:56:22 +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
Chris Nauroth
8b2c8a657e YARN-1138. yarn.application.classpath is set to point to etc., which does not work on Windows. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556978 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-09 23:04:18 +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
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
Karthik Kambatla
1152e23ed0 YARN-1463. Tests should avoid starting http-server where possible or creates spnego keytab/principals (vinodkv via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1553790 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-28 06:55:30 +00:00
Sanford Ryza
1b9b956924 MAPREDUCE-5692. Add explicit diagnostics when a task attempt is killed due to speculative execution (Gera Shegalov via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552797 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-20 19:53:59 +00:00
Vinod Kumar Vavilapalli
9184c4d179 MAPREDUCE-5687. Correcting the previous commit by ushing the right patch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552069 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-18 19:27:43 +00:00
Vinod Kumar Vavilapalli
d52bfdef95 MAPREDUCE-5687. Fixed failure in TestYARNRunner caused by YARN-1446. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551774 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-18 00:13:58 +00:00
Jason Darrell Lowe
fc77ed153e MAPREDUCE-5623. TestJobCleanup fails because of RejectedExecutionException and NPE. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551285 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-16 17:44:49 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
643155cbee MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1486271 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-25 01:46:14 +00:00
Vinod Kumar Vavilapalli
259edf8dca YARN-571. Remove user from ContainerLaunchContext. Contributed by Omkar Vinit Joshi. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485928 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 03:22:54 +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
27e6673ec3 MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485085 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 06:36:24 +00:00
Vinod Kumar Vavilapalli
7359dc32d3 MAPREDUCE-4067. Changed MRClientProtocol api to throw IOException only (Xuan Gong via vinodkv) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481695 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 03:34:25 +00:00
Vinod Kumar Vavilapalli
2638bc67a4 YARN-634. Modified YarnRemoteException to be not backed by PB and introduced a separate SerializedException record. Contributed by Siddharth Seth. 
MAPREDUCE-5239. Updated MR App to reflect YarnRemoteException changes after YARN-634. Contributed by Siddharth Seth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1481205 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 21:49:28 +00:00
Vinod Kumar Vavilapalli
0727ecaf50 YARN-631. Changed ClientRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong. 
MAPREDUCE-5212. Handling YarnRemoteException separately from IOException in MR App after YARN-631. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480494 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 22:53:01 +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
Vinod Kumar Vavilapalli
92b7165a71 YARN-629. Make YarnRemoteException not be rooted at IOException. Contributed by Xuan Gong. 
MAPREDUCE-5204. Handling YarnRemoteException separately from IOException in MR app after YARN-629. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1479680 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-06 19:04:31 +00:00
Aaron Myers
ca2c38fba1 MAPREDUCE-5193. A few MR tests use block sizes which are smaller than the default minimum block size. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478250 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 01:59:36 +00:00
Vinod Kumar Vavilapalli
448df18646 YARN-577. Add application-progress also to ApplicationReport. Contributed by Hitesh Shah. 
MAPREDUCE-5178. Update MR App to set progress in ApplicationReport after YARN-577. Contributed by Hitesh Shah.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475636 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 05:42:22 +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
Bikas Saha
c1ce3c5ad2 MAPREDUCE-4987. TestMRJobs#testDistributedCache fails on Windows due to classpath problems and unexpected behavior of symlinks (Chris Nauroth via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470003 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 19:32:33 +00:00
Bikas Saha
9e650d36b7 MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469060 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 20:25:21 +00:00