Commit Graph

6837 Commits

Author SHA1 Message Date
Jing Zhao 976af1d50a HDFS-6704. Merge r1612613 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612615 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 17:12:26 +00:00
Arpit Agarwal 73d109304d HADOOP-10864: Merging r1612609 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612610 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 16:57:48 +00:00
Zhijie Shen 7b4f8a74ec YARN-2319. Made the MiniKdc instance start/close before/after the class of TestRMWebServicesDelegationTokens. Contributed by Wenwu Peng.
svn merge --ignore-ancestry -c 1612588 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612590 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 15:17:13 +00:00
Junping Du 1ad0a08c20 Merge r1612565 from trunk: YARN-2242. Addendum patch. Improve exception information on AM launch crashes. (Contributed by Li Lu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612566 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 13:11:51 +00:00
Tsz-wo Sze d0b9bf11ab svn merge -c 1612493 from trunk for HDFS-6702. Change DFSClient to pass the StorageType from the namenode to datanodes and change datanode to write block replicas using the specified storage type.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612494 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 07:43:58 +00:00
Zhijie Shen 170504a15c YARN-2270. Made TestFSDownload#testDownloadPublicWithStatCache be skipped when there’s no ancestor permissions. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1612460 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612461 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 05:02:26 +00:00
Junping Du f6b932fe48 Merget r1612449 from trunk: YARN-2013. The diagnostics is always the ExitCodeException stack when the container crashes. (Contributed by Tsuyoshi OZAWA)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612450 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 03:04:22 +00:00
Karthik Kambatla 10a82e54da YARN-2131. Addendum. Add a way to format the RMStateStore. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612444 13f79535-47bb-0310-9956-ffa450edef68
2014-07-22 01:33:17 +00:00
Tsz-wo Sze 33d82259aa svn merge -c 1612427 from trunk for HDFS-6680. BlockPlacementPolicyDefault does not choose favored nodes correctly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612430 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 23:23:52 +00:00
Colin McCabe dc688e8d5e HADOOP-10866. RawLocalFileSystem fails to read symlink targets via the stat command when the format of the stat command uses non-curly quotes (yzhang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612429 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 23:23:30 +00:00
Jason Darrell Lowe 3fc91db99f svn merge -c 1612411 FIXES: YARN-2321. NodeManager web UI can incorrectly report Pmem enforcement. Contributed by Leitao Guo
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612414 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 22:08:12 +00:00
Andrew Wang 04b1192ed6 HADOOP-10755. Support negative caching of user-group mapping. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612409 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 21:52:52 +00:00
Jason Darrell Lowe 0e2fee873d svn merge -c 1612400 FIXES: MAPREDUCE-5756. CombineFileInputFormat.getSplits() including directories in its results. Contributed by Jason Dere
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612402 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 21:30:33 +00:00
Colin McCabe d038d161c2 HADOOP-10857. Native Libraries Guide does not mention a dependency on openssl-development package (ozawa via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612385 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 19:05:31 +00:00
Jason Darrell Lowe 7c44536678 svn merge -c 1612358 FIXES: 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/branches/branch-2@1612371 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 18:22:45 +00:00
Jason Darrell Lowe f57b6946d7 svn merge -c 1612285 FIXES: YARN-2045. Data persisted in NM should be versioned. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612289 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 14:49:38 +00:00
Sanford Ryza 28aae5c8c0 YARN-2323. FairShareComparator creates too many Resource objects (Hong Zhiguo via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612188 13f79535-47bb-0310-9956-ffa450edef68
2014-07-21 05:00:56 +00:00
Karthik Kambatla fcb0fe0548 YARN-2244. FairScheduler missing handling of containers for unknown application attempts. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611841 13f79535-47bb-0310-9956-ffa450edef68
2014-07-19 00:20:16 +00:00
Xuan Gong 5b0492f7c5 YARN-2208. AMRMTokenManager need to have a way to roll over AMRMToken. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611819 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 21:44:40 +00:00
Aaron Myers b4d07574ba Move CHANGES.txt info for HDFS-6632 from 2.6 to 2.5 section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611808 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 21:10:43 +00:00
Haohui Mai 08aae68182 HDFS-6632. Reintroduce dfs.http.port / dfs.https.port in branch-2. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611794 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 20:35:02 +00:00
Alejandro Abdelnur b8a6d81d68 HADOOP-10817. ProxyUsers configuration should support configurable prefixes. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611781 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 19:43:38 +00:00
Tsz-wo Sze 965da8312e svn merge -c 1611750 from trunk for HDFS-6616. Add exclude-datanodes feature to WebHDFS redirection so that it will not redirect retries to the same datanode.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611751 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 18:21:18 +00:00
Daryn Sharp 69b2c7f603 svn merge -c 1611737 FIXES: HDFS-6599. 2.4 addBlock is 10 to 20 times slower compared to 0.23 (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611738 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 18:01:59 +00:00
Tsz-wo Sze 9462e9e0e9 svn merge -c 1611731 from trunk for HDFS-6700. BlockPlacementPolicy shoud choose storage but not datanode for deletion.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611734 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 17:51:39 +00:00
Colin McCabe 325a7d5d94 fix eol style on TestBootstrapStandbyWithBKJM
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611727 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 17:23:44 +00:00
Chris Nauroth fcca9666a8 HDFS-6597. Merging change r1611723 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611724 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 17:17:15 +00:00
Vinayakumar B a61f91286f Merged revision(s) 1611562 from hadoop/common/trunk:
HDFS-4120. Add a new "-skipSharedEditsCheck" option for BootstrapStandby ( Contributed by Liang Xie and Rakesh R )


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611563 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 08:49:40 +00:00
Vinayakumar B 234f792f3e reverted
HDFS-4120. Add a new "-skipSharedEditsCheck" option for BootstrapStandby ( Contributed by Rakesh R )
........


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611561 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 08:47:01 +00:00
Vinayakumar B d21d50bb82 Merged revision(s) 1611556 from hadoop/common/trunk:
HDFS-4120. Add a new "-skipSharedEditsCheck" option for BootstrapStandby ( Contributed by Rakesh R )


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611557 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 08:34:29 +00:00
Vinayakumar B a33ec0a90f Merged revision(s) 1611538 from hadoop/common/trunk:
HDFS-6655. Add 'header banner' to 'explorer.html' also in Namenode UI ( Contributed by Vinayakumar B )


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611539 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 04:27:54 +00:00
Junping Du f81b04df50 Merge r1611512 from trunk: YARN-1341. Recover NMTokens upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611514 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 23:38:36 +00:00
Jing Zhao c02ea4b655 HDFS-6667. Merge change r1611508 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611510 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 23:16:48 +00:00
Aaron Myers 136aa73c78 HADOOP-10610. Upgrade S3n s3.fs.buffer.dir to support multi directories. Contrbuted by Ted Malaska.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611490 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 21:58:07 +00:00
Vinayakumar B 642e5c137d Merged revision(s) 1611441 from hadoop/common/trunk:
HDFS-6693. TestDFSAdminWithHA fails on windows ( Contributed by Vinayakumar B )


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611442 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 19:19:00 +00:00
Jian He 99805f5eac Merge r1611434 from trunk. MAPREDUCE-5910. Make MR AM resync with RM in case of work-preserving RM-restart. Contributed by Rohith
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611436 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 19:01:27 +00:00
Colin McCabe 9fce60d908 HADOOP-10591. Compression codecs must used pooled direct buffers or deallocate direct buffers when stream is closed (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611427 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 18:20:53 +00:00
Owen O'Malley d157d7fb81 HADOOP-10733. Fix potential null dereference in CredShell. (Ted Yu via
omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611421 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 18:12:45 +00:00
Owen O'Malley 4dd217a8c1 HADOOP-10732. Fix locking in credential update. (Ted Yu via omalley)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611416 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 17:47:19 +00:00
Jing Zhao 27e2008484 HDFS-6478. Merge r1611410 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611412 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 17:39:54 +00:00
Owen O'Malley 4143eec554 HADOOP-10607 Forgot the CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611393 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 15:57:10 +00:00
Owen O'Malley 9c3a7f8659 HADOOP-10607. Create an API to separate credentials/password storage from
applications. (Larry McCay via omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611391 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 15:52:58 +00:00
Jian He ad43e5bd1a Merge r1611240 from trunk. Addendum patch for YARN-2219
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611241 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 03:33:12 +00:00
Andrew Wang af13d4e18c HDFS-6690. Deduplicate xattr names in memory. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611227 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 00:44:50 +00:00
Vinod Kumar Vavilapalli 63e374060e YARN-2219. Changed ResourceManager to avoid AMs and NMs getting exceptions after RM recovery but before scheduler learns about apps and app-attempts. Contributed by Jian He.
svn merge --ignore-ancestry -c 1611222 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611223 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 00:15:28 +00:00
Andrew Wang 59c91b22d7 MAPREDUCE-5971. Move the default options for distcp -p to DistCpOptionSwitch. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611218 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 23:43:00 +00:00
Karthik Kambatla 4c7db3c6a3 MAPREDUCE-5952. LocalContainerLauncher#renameMapOutputForReduce incorrectly assumes a single dir for mapOutIndex. (Gera Shegalov via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611197 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 21:30:19 +00:00
Brandon Li d405271060 HDFS-6689. Merging change r1611135 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611152 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 19:46:19 +00:00
Chris Nauroth 9fa9b91afe HADOOP-10839. Merging change r1611134 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611136 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 18:52:41 +00:00
Jian He 1c2fec20c9 Merge r1611126 from trunk. YARN-2264. Fixed a race condition in DrainDispatcher which may cause random test failures. Contributed by Li Lu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611127 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 18:27:09 +00:00