1264 Commits

Author SHA1 Message Date
Jason Lowe
ea828578a3 MAPREDUCE-6334. Fetcher#copyMapOutput is leaking usedMemory upon IOException during InMemoryMapOutput shuffle handler. Contributed by Eric Payne
(cherry picked from commit bc1bd7e5c4047b374420683d36a8c30eda6d75b6)
2015-04-28 20:19:52 +00:00
Vinod Kumar Vavilapalli
32dc13d907 MAPREDUCE-6324. Fixed MapReduce uber jobs to not fail the udpate of AM-RM tokens when they roll-over. Contributed by Jason Lowe.
(cherry picked from commit 9fc32c5c4d1d5f50c605bdb0e3b13f44c86660c8)
2015-04-27 14:59:57 -07:00
Tsuyoshi Ozawa
fa9def5a2a MAPREDUCE-6341. Fix typo in mapreduce tutorial. Contributed by John Michael Luy.
(cherry picked from commit 9a3dda3d345b94cf6f9062c00395500596829cf1)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md
2015-04-28 01:58:12 +09:00
Devaraj K
84ae26573c MAPREDUCE-6252. JobHistoryServer should not fail when encountering a
missing directory. Contributed by Craig Welch.

(cherry picked from commit 5e67c4d384193b38a85655c8f93193596821faa5)
2015-04-27 15:02:44 +05:30
Gera Shegalov
fa915f73e2 MAPREDUCE-6333. TestEvents,TestAMWebServicesTasks,TestAppController are broken due to MAPREDUCE-6297. (Siqi Li via gera)
(cherry picked from commit 78c6b462412bbadad4a1a13ed4c597927b0cf188)
2015-04-24 17:38:16 -07:00
Vinod Kumar Vavilapalli
0ec6e7e7f5 YARN-3413. Changed Nodelabel attributes (like exclusivity) to be settable only via addToClusterNodeLabels but not changeable at runtime. (Wangda Tan via vinodkv)
(cherry picked from commit f5fe35e297ed4a00a1ba93d090207ef67cebcc9d)
2015-04-23 11:25:30 -07:00
Tsuyoshi Ozawa
542d53a268 MAPREDUCE-6330. Fix typo in some Task Attempt API's URL. Contributed by Ryu Kobayashi.
(cherry picked from commit e33594dd87f83953b59b7416c82992de760eb4cd)
2015-04-23 03:22:02 +09:00
Gera Shegalov
6f06e3b7ea MAPREDUCE-6297. Task Id of the failed task in diagnostics should link to the task page. (Siqi Li via gera)
(cherry picked from commit 89ded89e86e5d9a634d92a5d8a7c889744d97f94)
2015-04-21 14:21:57 -07:00
Gera Shegalov
6f5dc9f5af MAPREDUCE-6293. Set job classloader on uber-job's LocalContainerLauncher event thread. (Sangjin Lee via gera)
(cherry picked from commit 725eb52ddc647074f0bf1cc73c3029f1352f51d5)
2015-04-21 14:21:56 -07:00
Robert Kanter
756c254293 MAPREDUCE-6238. MR2 can't run local jobs with -libjars command options which is a regression from MR1 (zxu via rkanter)
(cherry picked from commit d50e8f09287deeb51012d08e326a2ed71a6da869)
2015-04-20 14:14:49 -07:00
Jian He
42cf8e0554 YARN-3021. YARN's delegation-token handling disallows certain trust setups to operate properly over DistCp. Contributed by Yongjun Zhang
(cherry picked from commit bb6dde68f19be1885a9e7f7949316a03825b6f3e)
2015-04-16 19:44:32 -07:00
Akira Ajisaka
51c458a5c4 MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li.
(cherry picked from commit 1fa8075794894b3e0053d251788277fb88e85533)
2015-04-16 10:06:03 -05:00
Akira Ajisaka
4801b0b478 Revert "MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li."
This reverts commit 3de0bf9a35094f3c2ac216992d861729251b6a3d.
2015-04-11 12:37:44 +09:00
Jian He
d3daf9665c YARN-3348. Add a 'yarn top' tool to help understand cluster usage. Contributed by Varun Vasudev 2015-04-10 10:40:31 -07:00
Akira Ajisaka
3de0bf9a35 MAPREDUCE-6300. Task list sort by task id broken. Contributed by Siqi Li.
(cherry picked from commit 4cec9975c0e2c2fcca090888dc2c5e149c5be1e9)
2015-04-11 01:31:44 +09:00
Akira Ajisaka
f603b9ccca MAPREDUCE-6307. Remove property mapreduce.tasktracker.taskmemorymanager.monitoringinterval. Contributed by J.Andreina.
(cherry picked from commit 83979e61a49daa67a05eed1ba64c24d31a41610a)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
2015-04-10 20:23:46 +09:00
Harsh J
b817f0924d MAPREDUCE-6314. TestPipeApplication fails on trunk. Contributed by Varun Vasudev.
(cherry picked from commit c91b2de68ad8137a909641fdec498f2024af4476)
2015-04-10 14:03:37 +05:30
Robert Kanter
0fdd5c23c3 MAPREDUCE-6266. Job#getTrackingURL should consistently return a proper URL (rchiang via rkanter)
(cherry picked from commit c4986b2d00d327f18d0c7e2f8805b69a4e07a19b)
2015-04-09 13:49:03 -07:00
Hitesh Shah
55b794e7fa YARN-2890. MiniYarnCluster should turn on timeline service if configured to do so. Contributed by Mit Desai.
(cherry picked from commit 265ed1fe804743601a8b62cabc1e4dc2ec8e502f)
2015-04-08 14:14:06 -07:00
Gera Shegalov
3757e731e6 MAPREDUCE-4844. Counters / AbstractCounters have constant references not declared final. (Brahma Reddy Battula via gera)
(cherry picked from commit a0795c1e81685b812288cf2f4df6f8d23da30ab8)
2015-04-03 10:35:18 -07:00
Junping Du
cacadea632 MAPREDUCE-6303. Read timeout when retrying a fetch error can be fatal to a reducer. Contributed by Jason Lowe.
(cherry picked from commit eccb7d46efbf07abcc6a01bd5e7d682f6815b824)
2015-04-02 12:15:12 -07:00
Vinod Kumar Vavilapalli
defae1d399 Revert "MAPREDUCE-6288. Changed permissions on JobHistory server's done directory so that user's client can load the conf files directly. Contributed by Robert Kanter."
This reverts commit 5358b83167777a7108b32c9900fb0d01ca0fe961.

(cherry picked from commit cc0a01c50308fe599b4bdd5a80068d6244062e4f)
2015-03-30 14:52:36 -07:00
Vinod Kumar Vavilapalli
cc130a033a MAPREDUCE-6288. Changed permissions on JobHistory server's done directory so that user's client can load the conf files directly. Contributed by Robert Kanter.
(cherry picked from commit 5358b83167777a7108b32c9900fb0d01ca0fe961)
2015-03-30 10:28:28 -07:00
Vinod Kumar Vavilapalli
c5bc48946d YARN-3304. Cleaning up ResourceCalculatorProcessTree APIs for public use and removing inconsistencies in the default values. Contributed by Junping Du and Karthik Kambatla.
(cherry picked from commit c358368f511963ad8e35f030b9babee541e1bd01)
2015-03-30 10:11:12 -07:00
Harsh J
274db918c3 MAPREDUCE-6291. Correct mapred queue usage command. Contributed by Brahma Reddy Battula.
(cherry picked from commit f5432cb47dfacaa57faed32a29d00bbeff8a5385)
2015-03-28 11:58:44 +05:30
Akira Ajisaka
853cc04668 MAPREDUCE-5762. Port MAPREDUCE-3223 (Remove MRv1 config from mapred-default.xml) to branch-2. (aajisaka) 2015-03-28 03:35:03 +09:00
Tsuyoshi Ozawa
f0aa2a7466 MAPREDUCE-6294. Remove an extra parameter described in Javadoc of TockenCache. Contributed by Brahma Reddy Battula.
(cherry picked from commit 05499b1093ea6ba6a39a1354d67b0a46a2982824)
2015-03-28 00:08:56 +09:00
Akira Ajisaka
2e509908ee MAPREDUCE-6292. Use org.junit package instead of junit.framework in TestCombineFileInputFormat. (aajisaka)
(cherry picked from commit c770df49b4c9d5ac5ddaa4ff2ec541e4bd1a8e56)
2015-03-25 19:01:38 +09:00
Tsuyoshi Ozawa
94eb8e5b3d MAPREDUCE-6285. ClientServiceDelegate should not retry upon AuthenticationException. Contributed by Jonathan Eagles.
(cherry picked from commit 4170c99147b0cb6d561ff626cea140e0a061b314)
2015-03-25 00:57:08 +09:00
Devaraj K
943d9ee603 MAPREDUCE-6242. Progress report log is incredibly excessive in application
master. Contributed by Varun Saxena.
2015-03-23 22:48:00 +05:30
Harsh J
6e6e0e4a37 MAPREDUCE-5448. Addendum fix to remove deprecation warning by junit.Assert import in TestFileOutputCommitter.
(cherry picked from commit 4cd54d9a297435150ab61803284eb05603f114e2)
2015-03-22 10:33:29 +05:30
Harsh J
d43c0da7d7 MAPREDUCE-5190. Unnecessary condition test in RandomSampler. Contributed by Jingguo Yao.
(cherry picked from commit 1d5c796d654c8959972d15cc6742731a99380bfc)
2015-03-22 10:04:19 +05:30
Harsh J
a7f1c1b993 MAPREDUCE-5448. MapFileOutputFormat#getReaders bug with invisible files/folders. Contributed by Maysam Yabandeh.
(cherry picked from commit b46c2bb51ae524e6640756620f70e5925cda7592)
2015-03-22 09:46:54 +05:30
Harsh J
7c72c7f529 MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which causes counter limits are not reset correctly. Contributed by Zhihai Xu.
(cherry picked from commit 433542904aba5ddebf9bd9d299378647351eb13a)
2015-03-22 02:51:17 +05:30
Harsh J
418d078bc5 MAPREDUCE-6213. NullPointerException caused by job history server addr not resolvable. Contributed by Peng Zhang.
(cherry picked from commit e1e09052e861926112493d6041aae01ab594b547)
2015-03-22 02:45:01 +05:30
Harsh J
97da36777f MAPREDUCE-6239. Consolidate TestJobConf classes in hadoop-mapreduce-client-jobclient and hadoop-mapreduce-client-core. Contributed by Varun Saxena. 2015-03-22 02:20:11 +05:30
Robert Kanter
308460654a MAPREDUCE-6282. Reuse historyFileAbsolute.getFileSystem in CompletedJob#loadFullHistoryData for code optimization. (zxu via rkanter)
(cherry picked from commit d4f7e2507f4bb024444d172f94e74431bc2f319c)
2015-03-20 13:12:34 -07:00
Jason Lowe
cabe676d67 MAPREDUCE-6275. Race condition in FileOutputCommitter v2 for user-specified task output subdirs. Contributed by Gera Shegalov and Siqi Li
(cherry picked from commit 91baca145a6c16fe13f455d150c05bd73179531b)
2015-03-19 21:40:51 +00:00
Jason Lowe
24d8c6f355 MAPREDUCE-6277. Job can post multiple history files if attempt loses connection to the RM. Contributed by Chang Li
(cherry picked from commit 30da99cbaf36aeef38a858251ce8ffa5eb657b38)
2015-03-18 19:31:32 +00:00
Tsuyoshi Ozawa
bb828565f8 MAPREDUCE-5755. MapTask.MapOutputBuffer#compare/swap should have @Override annotation. (ozawa)
(cherry picked from commit bb243cea93b6872ef8956311a2290ca0b83ebb22)
2015-03-17 14:55:33 +09:00
Harsh J
5e403e8b8d MAPREDUCE-6100. replace mapreduce.job.credentials.binary with MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY for better readability. Contributed by Zhihai Xu.
(cherry picked from commit f222bde273cc10a38945dc31e85206a0c4f06a12)
2015-03-17 11:08:32 +05:30
Harsh J
0e9f78dda2 MAPREDUCE-6105. nconsistent configuration in property mapreduce.reduce.shuffle.merge.percent. Contributed by Ray Chiang.
(cherry picked from commit 26a23b11598b3757ed4973781890e2cd2fc270df)
2015-03-17 02:27:33 +05:30
Harsh J
2684b0b440 MAPREDUCE-4414. Add main methods to JobConf and YarnConfiguration, for debug purposes. Contributed by Plamen Jeliazkov.
(cherry picked from commit 571f75b468a4412be2178466cb5d3888b05cd076)
2015-03-17 01:02:21 +05:30
Tsuyoshi Ozawa
10745fcecd MAPREDUCE-6265. Make ContainerLauncherImpl.INITIAL_POOL_SIZE configurable to better control to launch/kill containers. Contributed by Zhihai Xu
(cherry picked from commit 9d38520c8e42530a817a7f69c9aa73a9ad40639c)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
2015-03-14 16:45:23 +09:00
Jonathan Eagles
44aedad5dd YARN-3267. Timelineserver applies the ACL rules after applying the limit on the number of records (Chang Li via jeagles)
(cherry picked from commit 8180e676abb2bb500a48b3a0c0809d2a807ab235)
2015-03-13 12:05:21 -05:00
Haohui Mai
e75e6c66ea HADOOP-11633. Convert remaining branch-2 .apt.vm files to markdown. Contributed by Masatake Iwasaki. 2015-03-11 14:23:44 -07:00
Gera Shegalov
6802e8fefc MAPREDUCE-4815. Speed up FileOutputCommitter#commitJob for many output files. (Siqi Li via gera)
(cherry picked from commit aa92b764a7ddb888d097121c4d610089a0053d11)
2015-03-10 11:40:45 -07:00
Tsuyoshi Ozawa
482504befd MAPREDUCE-4742. Fix typo in nnbench#displayUsage. Contributed by Liang Xie.
(cherry picked from commit 20b8ee1350e62d1b21c951e653302b6e6a8e4f7e)
2015-03-11 00:41:37 +09:00
Junping Du
dbcdcb0d3c Configurable timeout between YARNRunner terminate the application and forcefully kill. Contributed by Eric Payne.
(cherry picked from commit d39bc903a0069a740744bafe10e506e452ed7018)
2015-03-10 06:23:24 -07:00
Tsuyoshi Ozawa
b46f9e72db HADOOP-11602. Backport 'Fix toUpperCase/toLowerCase to use Locale.ENGLISH.' (ozawa) 2015-03-09 19:53:55 +09:00