Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,312 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

7312 Commits

Author SHA1 Message Date
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
Alejandro Abdelnur db646f04f3 HADOOP-10817. ProxyUsers configuration should support configurable prefixes. (tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619533 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:22 +00:00
Alejandro Abdelnur 9467bef8ea HADOOP-10816. KeyShell returns -1 on error to the shell, should be 1. (Mike Yoder via wang) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619532 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:21 +00:00
Alejandro Abdelnur 0ef751797e HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619531 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:19 +00:00
Alejandro Abdelnur b3904630d6 HADOOP-10736. Add key attributes to the key shell. Contributed by Mike Yoder. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619530 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:18 +00:00
Alejandro Abdelnur 1b65ed7795 HADOOP-10812. Delegate KeyProviderExtension#toString to underlying KeyProvider. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619529 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:16 +00:00
Alejandro Abdelnur bd7e551bc1 HADOOP-10769. Create KeyProvider extension to handle delegation tokens. Contributed by Arun Suresh. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619528 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:15 +00:00
Alejandro Abdelnur 65923ca24e HADOOP-10719. Add generateEncryptedKey and decryptEncryptedKey methods to KeyProvider. (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@1619527 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:13 +00:00
Alejandro Abdelnur edb969c3ff HADOOP-10757. KeyProvider KeyVersion should provide the key name. (asuresh via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619526 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:11 +00:00
Alejandro Abdelnur 2b3010483d HADOOP-10695. KMSClientProvider should respect a configurable timeout. (yoderme via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619525 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:09 +00:00
Alejandro Abdelnur 27b1f41455 HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619524 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:07 +00:00
Alejandro Abdelnur 2b327abe86 HADOOP-10607. Addendum, bringing in changes, KMS related, which were left out in the original merge. 
Conflicts:
	hadoop-common-project/hadoop-common/src/main/bin/hadoop
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619523 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:03 +00:00
Alejandro Abdelnur 137ecfc74f HADOOP-10611. KMS, keyVersion name should not be assumed to be keyName@versionNumber. (tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619522 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:02 +00:00
Alejandro Abdelnur 2b0016ec18 HADOOP-10645. TestKMS fails because race condition writing acl files. (tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619521 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:58:59 +00:00
Alejandro Abdelnur a5892e519c HADOOP-10586. KeyShell doesn't allow setting Options via CLI. (clamb via tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619520 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:58:57 +00:00
Alejandro Abdelnur eebaaa3f16 HADOOP-10583. bin/hadoop key throws NPE with no args and assorted other fixups. (clamb via tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619519 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:58:55 +00:00
Alejandro Abdelnur d637c71e4d HADOOP-10433. Key Management Server based on KeyProvider API. (tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-project/pom.xml

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619518 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:58:53 +00:00