Commit Graph

7028 Commits

Author SHA1 Message Date
Colin Patrick Mccabe 01b2c9b15f HDFS-6902. FileWriter should be closed in finally block in BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe)
(cherry picked from commit b6b95ff667)
2014-08-27 13:51:10 -07:00
Colin Patrick Mccabe fdc15db2e1 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang.
(cherry picked from commit 225569ece2)
2014-08-27 13:45:10 -07:00
Colin Patrick Mccabe ddb9d565c8 HDFS-6773. MiniDFSCluster should skip edit log fsync by default. Contributed by Stephen Chu.
(cherry picked from commit d805cc27a9)
2014-08-27 13:37:48 -07:00
brandonli 99d8434511 HDFS-6892. Add XDR packaging method for each NFS request. Contributed by Brandon Li
(cherry picked from commit cd9182d8b5)
2014-08-27 11:15:13 -07:00
Jing Zhao c8b254d70e HDFS-6908. Incorrect snapshot directory diff generated by snapshot deletion. Contributed by Juan Yu and Jing Zhao.
(cherry picked from commit 6b441d227a)
2014-08-27 10:28:37 -07:00
Jian He 5c63482aaa YARN-2182. Updated ContainerId#toString() to append RM Epoch number. Contributed by Tsuyoshi OZAWA
(cherry-picked from commit e2d0ff364a)
2014-08-27 10:11:24 -07:00
Jason Lowe 38df629367 MAPREDUCE-5885. build/test/test.mapred.spill causes release audit warnings. Contributed by Chen He
(cherry picked from commit 812bd0c0e5)
2014-08-27 15:22:06 +00:00
Zhijie Shen 0c785f0824 YARN-2035. FileSystemApplicationHistoryStore should not make working dir when it already exists. Contributed by Jonathan Eagles.
(cherry picked from commit d778abf022)
2014-08-27 02:10:06 -07:00
Karthik Kambatla 9c43760e59 YARN-1326. RM should log using RMStore at startup time. (Tsuyoshi Ozawa via kasha)
(cherry picked from commit d16bfd1d0f)
2014-08-27 01:44:28 -07:00
Karthik Kambatla ba95033cc4 Fix CHANGES.txt entry for MAPREDUCE-6033.
(cherry picked from commit 2d9b77d617)
2014-08-27 01:17:19 -07:00
Karthik Kambatla 2a3c8331fe Add a section for 2.5.1 in CHANGES.txt
(cherry picked from commit dc154ab86d)
2014-08-27 00:56:17 -07:00
Arpit Agarwal 9d09b549c5 HDFS-6899: Merging r1619970 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619975 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:36:46 +00:00
Arpit Agarwal 1846514dd2 HDFS-6899. Undo merge of r1619973
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619974 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:23:56 +00:00
Arpit Agarwal 554476881f HDFS-6899: Merging r1619970 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619973 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:22:38 +00:00
Arpit Agarwal 3031e29a90 HDFS-6899. Undo merge of r1619971
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619972 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:22:15 +00:00
Arpit Agarwal 36e3de0577 HDFS-6899: Merging r1619970 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619971 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:01:38 +00:00
Chris Nauroth b2d86ebf78 HDFS-4852. Merging change r1619967 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619968 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 05:30:59 +00:00
Arpit Agarwal 33229c1299 HADOOP-10282: Merging r1619938 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619939 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 22:16:37 +00:00
Sanford Ryza c38e751bca MAPREDUCE-5130. Fix mapred-default.xml after bad merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619930 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 20:58:12 +00:00
Allen Wittenauer 64abf82242 HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619888 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 18:25:57 +00:00
Arpit Agarwal d9e55176b8 HDFS-6829: Merging r1619882 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619883 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 18:15:13 +00:00
Zhijie Shen 7cad25ec94 MAPREDUCE-6044. Fully qualified intermediate done dir path breaks per-user dir creation on Windows. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1619863 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619864 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 17:08:17 +00:00
Karthik Kambatla 21843592db YARN-2393. FairScheduler: Add the notion of steady fair share. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619852 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 16:00:57 +00:00
Christopher Douglas 7ca74a025e Revert HADOOP-10759 due to aw veto
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619692 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 07:17:51 +00:00
Chris Nauroth a6f5f71a12 HADOOP-10989. Merging change r1619659 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619660 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 04:05:56 +00:00
Allen Wittenauer 20ab9d7d4a HADOOP-8896. Javadoc points to Wrong Reader and Writer classes in SequenceFile (Ray Chiang via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619633 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 23:59:48 +00:00
Sanford Ryza 53da85efaf 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/branches/branch-2@1619631 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 23:54:38 +00:00
Jason Darrell Lowe fab20109ae svn merge -c 1619614 FIXES: YARN-2434. RM should not recover containers from previously failed attempt when AM restart is not enabled. Contributed by Jian He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619616 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 22:45:35 +00:00
Jason Darrell Lowe 23b4c0b6c1 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619605 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 21:41:24 +00:00
Alejandro Abdelnur 572a158cf8 HADOOP-10488. TestKeyProviderFactory fails randomly. (tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619554 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 19:00:08 +00:00
Alejandro Abdelnur dce6f78df6 Fix hadoop-common CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619553 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 19:00:07 +00:00
Alejandro Abdelnur eff192af69 HADOOP-10698. KMS, add proxyuser support. (tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619552 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 19:00:06 +00:00
Alejandro Abdelnur c065137496 HADOOP-10967. Improve DefaultCryptoExtension#generateEncryptedKey performance. (hitliuyi via tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619551 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 19:00:03 +00:00
Alejandro Abdelnur 4dea3e8192 HADOOP-10770. KMS add delegation token support. (tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619550 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 19:00:01 +00:00
Alejandro Abdelnur 59c16d7947 HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting underlying store. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619549 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:56 +00:00
Alejandro Abdelnur 6d2281b4c6 HADOOP-10862. Miscellaneous trivial corrections to KMS classes. (asuresh via tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619548 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:54 +00:00
Alejandro Abdelnur daed032553 HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit length keys. Contributed by Arun Suresh.
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619547 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:52 +00:00
Alejandro Abdelnur bcff355417 HADOOP-10918. JMXJsonServlet fails when used within Tomcat. (tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619546 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:51 +00:00
Alejandro Abdelnur 05daefb1a8 HADOOP-10936. Change default KeyProvider bitlength to 128. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619545 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:48 +00:00
Alejandro Abdelnur 331421c2a4 HADOOP-10937. Need to set version name correctly before decrypting EEK. Contributed by Arun Suresh.
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619544 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:46 +00:00
Alejandro Abdelnur c111c9379b HADOOP-10920. site plugin couldn't parse hadoop-kms index.apt.vm. Contributed by Akira Ajisaka.
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619543 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:44 +00:00
Alejandro Abdelnur e12d421ca2 HADOOP-10793. KeyShell args should use single-dash style. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619542 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:43 +00:00
Alejandro Abdelnur b781c3bc88 HADOOP-10756. KMS audit log should consolidate successful similar requests. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619541 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:41 +00:00
Alejandro Abdelnur c6eee38b81 HADOOP-10891. Add EncryptedKeyVersion factory method to KeyProviderCryptoExtension. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619540 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:38 +00:00
Alejandro Abdelnur 30fe1849c3 HADOOP-10881. Clarify usage of encryption and encrypted encryption key in KeyProviderCryptoExtension. (wang)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619539 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:36 +00:00
Alejandro Abdelnur 27609a184d HADOOP-10826. Iteration on KeyProviderFactory.serviceLoader is thread-unsafe. (benoyantony viat tucu)
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619538 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:34 +00:00
Alejandro Abdelnur 03f9e28a7e HADOOP-10720. KMS: Implement generateEncryptedKey and decryptEncryptedKey in the REST API. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619537 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:32 +00:00
Alejandro Abdelnur 7f8ac5b812 HADOOP-10750. KMSKeyProviderCache should be in hadoop-common. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619536 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:29 +00:00
Alejandro Abdelnur f21bd86958 HADOOP-10842. CryptoExtension generateEncryptedKey method should receive the key name. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619535 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:25 +00:00
Alejandro Abdelnur 0197f57ff4 HADOOP-10841. EncryptedKeyVersion should have a key name property. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619534 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:24 +00:00