Commit Graph

8835 Commits

Author SHA1 Message Date
Charles Lamb
74f7be0887 merge from trunk r1617527
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617532 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 17:02:07 +00:00
Charles Lamb
acc3d73a45 HDFS-6839. Fix TestCLI to expect new output. (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617526 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 16:50:18 +00:00
Junping Du
c2febdcbaa YARN-1337. Recover containers upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617448 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 10:56:13 +00:00
Alejandro Abdelnur
6d7a6766bd HADOOP-10835. Implement HTTP proxyuser support in HTTP authentication client/server libraries. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617384 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 00:10:15 +00:00
Jing Zhao
04884cd530 Merging r1616894 through r1617376 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1617377 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 22:27:50 +00:00
Brandon Li
b760f20af1 HDFS-6582. Missing null check in RpcProgramNfs3#read(XDR, SecurityHandler). Contributed by Abhiraj Butala
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617366 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 21:34:02 +00:00
Haohui Mai
80691b073f HDFS-6838. Code cleanup for unnecessary INode replacement. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617361 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 21:28:33 +00:00
Jian He
c4dc685343 YARN-2138. Cleaned up notifyDone* APIs in RMStateStore. Contributed by Varun Saxena
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617341 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 18:24:24 +00:00
Jing Zhao
e60673697d HDFS-6837. Code cleanup for Balancer and Dispatcher. Contributed by Tsz Wo Nicholas Sze.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617337 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 18:01:14 +00:00
Xuan Gong
946be75704 YARN-2400: Addendum fix for TestAMRestart failure. Contributed by Jian He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617333 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 17:42:53 +00:00
Karthik Kambatla
da7b508ffc YARN-2361. RMAppAttempt state machine entries for KILLED state has duplicate event entries. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617190 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 01:42:26 +00:00
Karthik Kambatla
bdd3e2ce49 YARN-2337. ResourceManager sets ClientRMService in RMContext multiple times. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617183 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 00:13:27 +00:00
Karthik Kambatla
af6d709664 HADOOP-10402. Configuration.getValByRegex does not substitute for variables. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617166 13f79535-47bb-0310-9956-ffa450edef68
2014-08-10 21:49:42 +00:00
Junping Du
e91d099c4a YARN-2302. Refactor TimelineWebServices. (Contributed by Zhijie Shen)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617055 13f79535-47bb-0310-9956-ffa450edef68
2014-08-10 07:21:15 +00:00
Xuan Gong
743f7f30da YARN-2400. Fixed TestAMRestart fails intermittently. Contributed by Jian He:
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617028 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 23:31:11 +00:00
Zhijie Shen
ee3825e278 YARN-1954. Added waitFor to AMRMClient(Async). Contributed by Tsuyoshi Ozawa.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617002 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 18:44:51 +00:00
Karthik Kambatla
a7643f4de7 YARN-2026. Fair scheduler: Consider only active queues for computing fairshare. (Ashwin Shankar via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616915 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 02:10:00 +00:00
Alejandro Abdelnur
74fe84393d HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting underlying store. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616908 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 00:00:32 +00:00
Alejandro Abdelnur
021ae47115 HADOOP-10862. Miscellaneous trivial corrections to KMS classes. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616903 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 23:10:11 +00:00
Jing Zhao
9d5f8fa68d Merging r1616428 through r1616893 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1616897 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 22:21:35 +00:00
Xuan Gong
eeb4acd955 YARN-2212: ApplicationMaster needs to find a way to update the AMRMToken periodically. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616892 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:38:24 +00:00
Jing Zhao
c3cf331dc9 HDFS-6828. Separate block replica dispatching from Balancer. Contributed by Tsz Wo Nicholas Sze.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616889 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:33:57 +00:00
Arpit Agarwal
05d1bf4157 HDFS-6830. Revert accidental checkin
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616884 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:22:48 +00:00
Arpit Agarwal
a70c9de3f1 HDFS-6830. BlockInfo.addStorage fails when DN changes the storage for a block replica. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616883 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:20:19 +00:00
Ravi Prakash
a42231d19b HDFS-6823. dfs.web.authentication.kerberos.principal shows up in logs for insecure HDFS
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616846 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 18:24:10 +00:00
Ravi Prakash
6da830cfdf HDFS-6823. dfs.web.authentication.kerberos.principal shows up in logs for insecure HDFS
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616845 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 18:21:18 +00:00
Charles Lamb
e6bdb33784 HADOOP-10919. Copy command should preserve raw.* namespace extended attributes. (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616840 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 17:58:01 +00:00
Chris Nauroth
70d453602c HDFS-573. Porting libhdfs to Windows. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616814 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 16:26:45 +00:00
Karthik Kambatla
6d39525f6b YARN-2352. Add missing file. FairScheduler: Collect metrics on duration of critical methods that affect performance. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616784 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 14:38:18 +00:00
Karthik Kambatla
14864e9c7c YARN-2352. FairScheduler: Collect metrics on duration of critical methods that affect performance. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616769 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 14:17:54 +00:00
Uma Maheswara Rao G
1fa2d6c4ba HDFS-6834. Improve the configuration guidance in DFSClient when there are no Codec classes found in configs. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616721 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 11:35:16 +00:00
Arpit Agarwal
d3a2fe2807 HDFS-6772. Get DN storages out of blockContentsStale state faster after NN restarts. (Contributed by Ming Ma)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616680 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:41:38 +00:00
Alejandro Abdelnur
be9c67930b HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616672 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:58:58 +00:00
Alejandro Abdelnur
4e7c4a6e1f HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 1. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616671 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:55:38 +00:00
Haohui Mai
2ac640ec75 HDFS-6722. Display readable last contact time for dead nodes on NN webUI. Contributed by Ming Ma.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616669 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:27:47 +00:00
Andrew Wang
17e4365756 Revert HADOOP-10876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616658 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 01:37:59 +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
Aaron Myers
d758be1f35 HDFS-6740. Make FSDataset support adding data volumes dynamically. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616623 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:59:59 +00:00
Brandon Li
8b32f84e87 HADOOP-10929. Typo in Configuration.getPasswordFromCredentialProviders. Contributed by Larry McCay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616616 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:47:52 +00:00
Aaron Myers
eca80dca3e HDFS-6728. Dynamically add new volumes to DataStorage, formatted if necessary. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616615 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:46:51 +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
Jian He
8437df8ba9 YARN-2008. Fixed CapacityScheduler to calculate headroom based on max available capacity instead of configured max capacity. Contributed by Craig Welch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616580 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 20:00:04 +00:00
Arpit Agarwal
b98400df7b HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616575 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 19:42:09 +00:00
Zhijie Shen
3bfdb0091d YARN-2288. Made persisted data in LevelDB timeline store be versioned. Contributed by Junping Du.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616540 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 17:02:26 +00:00
Steve Loughran
96fc3b3ecd HADOOP-10931 compile error on tools/hadoop-openstack
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616482 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 12:38:35 +00:00
Tsz-wo Sze
b50cb5e056 Merge r1609845 through r1616427 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1616428 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:38:23 +00:00
Tsz-wo Sze
0ed8732fee HDFS-6812. Remove addBlock and replaceBlock from DatanodeDescriptor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616426 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:30:53 +00:00
Tsz-wo Sze
83b9933db3 HDFS-6809. Move Balancer's inner classes MovedBlocks and Matcher as to standalone classes and separates KeyManager from NameNodeConnector.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616422 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:18:48 +00:00
Zhijie Shen
be6360593b YARN-2388. Fixed TestTimelineWebServices failure due to HADOOP-10791. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616405 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 05:36:50 +00:00