Commit Graph

8950 Commits

Author SHA1 Message Date
Tsz-wo Sze
2b07af0c59 Merge r1609845 through r1611734 from tunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1611736 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 17:57:51 +00:00
Tsz-wo Sze
08466eaa00 HDFS-6700. BlockPlacementPolicy shoud choose storage but not datanode for deletion.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611731 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 17:40:03 +00:00
Colin McCabe
936895722e fix eol style on TestBootstrapStandbyWithBKJM
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611726 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 17:23:05 +00:00
Chris Nauroth
5f9e52f745 HDFS-6597. Add a new option to NN upgrade to terminate the process after upgrade on NN is completed. Contributed by Danilo Vunjak.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611723 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 17:14:22 +00:00
Charles Lamb
962ef6939e HDFS-6490. Fix the keyid format for generated keys in FSNamesystem.createEncryptionZone (clamb)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1611722 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 17:13:55 +00:00
Vinayakumar B
9f75b97a09 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/trunk@1611562 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 08:48:52 +00:00
Vinayakumar B
8f0c341934 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/trunk@1611560 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 08:46:27 +00:00
Vinayakumar B
d2024f2e76 HDFS-4120. Add a new "-skipSharedEditsCheck" option for BootstrapStandby ( Contributed by Rakesh R )
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611556 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 08:32:40 +00:00
Alejandro Abdelnur
f714413615 HADOOP-10842. CryptoExtension generateEncryptedKey method should receive the key name. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611542 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 06:13:17 +00:00
Alejandro Abdelnur
7f06998bf2 HADOOP-10841. EncryptedKeyVersion should have a key name property. (asuresh via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611540 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 05:40:35 +00:00
Vinayakumar B
2c5ceee6ab 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/trunk@1611538 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 04:27:09 +00:00
Tsz-wo Sze
04fd2012fd Merge r1609845 through r1611528 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1611531 13f79535-47bb-0310-9956-ffa450edef68
2014-07-18 02:21:21 +00:00
Junping Du
403ec8ea80 YARN-1341. Recover NMTokens upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611512 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 23:33:22 +00:00
Jing Zhao
7ba5913797 HDFS-6667. In HDFS HA mode, Distcp/SLive with webhdfs on secure cluster fails with Client cannot authenticate via:[TOKEN, KERBEROS] error. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611508 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 23:11:27 +00:00
Aaron Myers
dae1b6cc2a HADOOP-10610. Upgrade S3n s3.fs.buffer.dir to support multi directories. Contributed by Ted Malaska.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611489 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 21:56:22 +00:00
Vinayakumar B
ce1659f070 HDFS-6693. TestDFSAdminWithHA fails on windows ( Contributed by Vinayakumar B )
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611441 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 19:17:51 +00:00
Jian He
875592220f 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/trunk@1611434 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 18:46:20 +00:00
Colin McCabe
ef9e24f826 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/trunk@1611423 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 18:17:18 +00:00
Owen O'Malley
1e7ce76bba HADOOP-10733. Fix potential null dereference in CredShell. (Ted Yu via
omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611419 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 18:09:41 +00:00
Owen O'Malley
9aaa714a99 HADOOP-10732. Fix locking in credential update. (Ted Yu via omalley)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611415 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 17:45:12 +00:00
Todd Lipcon
b2551c06a0 Import initial code for MAPREDUCE-2841 (native output collector)
Contributed by:
  Binglin Chang
  Yang Dong
  Sean Zhong
  Manu Zhang
  Zhongliang Zhu
  Vincent Wang
  Yan Dong
  Cheng Lian
  Xusen Yin
  Fangqin Dai
  Jiang Weihua
  Gansha Wu
  Avik Dey


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1611413 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 17:44:55 +00:00
Jing Zhao
f4151bbf4f HDFS-6478. RemoteException can't be retried properly for non-HA scenario. Contributed by Ming Ma.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611410 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 17:37:22 +00:00
Tsz-wo Sze
38af6101d8 HDFS-6671. Change BlockPlacementPolicy to consider block storage policy in replicaiton.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1611334 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 11:56:22 +00:00
Chris Nauroth
0a02b5a19b HADOOP-10840. Fix OutOfMemoryError caused by metrics system in Azure File System. Contributed by Shanyu Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611247 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 05:04:53 +00:00
Jian He
3c193811ca YARN-2219. Addendum patch for YARN-2219
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611240 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 03:28:39 +00:00
Andrew Wang
9dff25e890 HADOOP-10816. KeyShell returns -1 on error to the shell, should be 1. (Mike Yoder via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611229 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 00:49:08 +00:00
Andrew Wang
ca52cb01c4 HDFS-6690. Deduplicate xattr names in memory. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611226 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 00:44:16 +00:00
Vinod Kumar Vavilapalli
bda23181bf 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.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611222 13f79535-47bb-0310-9956-ffa450edef68
2014-07-17 00:14:56 +00:00
Allen Wittenauer
c477a166e1 HDFS-2538. option to disable fsck dots. Contributed by Mohammad Kamrul Islam.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611220 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 23:55:32 +00:00
Andrew Wang
e8a1ff7efe 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/trunk@1611217 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 23:42:34 +00:00
Karthik Kambatla
43a12f3c01 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/trunk@1611196 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 21:24:51 +00:00
Andrew Wang
77f0e2cca5 HDFS-6405. Test Crypto streams in HDFS. (yliu via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1611140 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 19:04:06 +00:00
Brandon Li
e896de98f2 HDFS-6689. NFS doesn't return correct lookup access for direcories. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611135 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 18:52:03 +00:00
Chris Nauroth
7f357d68cc HADOOP-10839. Add unregisterSource() to MetricsSystem API. Contributed by Shanyu Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611134 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 18:50:10 +00:00
Jian He
40e1bb9d31 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/trunk@1611126 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 18:25:05 +00:00
Chris Nauroth
43fe48d9e2 HDFS-5624. Add HDFS tests for ACLs in combination with viewfs. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611068 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 16:27:38 +00:00
Uma Maheswara Rao G
80d7f0911c HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610969 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 11:24:41 +00:00
Vinayakumar B
dc31d66f8a HADOOP-9921. daemon scripts should remove pid file on stop call after stop or process is found not running ( Contributed by Vinayakumar B)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610964 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 10:48:15 +00:00
Chris Nauroth
619837039b HADOOP-10845. Add common tests for ACLs in combination with viewfs. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610911 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 05:16:42 +00:00
Yi Liu
beb0c19cde HADOOP-10735. Fall back AesCtrCryptoCodec implementation from OpenSSL to JCE if non native support. (yliu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610887 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 00:36:30 +00:00
Jing Zhao
790ee45643 HADOOP-10673. Update rpc metrics when the call throws an exception. Contributed by Ming Ma.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610879 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 23:05:40 +00:00
Vinod Kumar Vavilapalli
030580387a YARN-2233. Implemented ResourceManager web-services to create, renew and cancel delegation tokens. Contributed by Varun Vasudev.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610876 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 23:00:17 +00:00
Chris Nauroth
2d91a0c0f1 HADOOP-7664. Move attribution to release 2.6.0 section in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610873 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 22:53:11 +00:00
Mayank Bansal
43589a8df7 YARN-1408 Preemption caused Invalid State Event: ACQUIRED at KILLED and caused a task timeout for 30mins. (Sunil G via mayank)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610860 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 21:48:58 +00:00
Andrew Wang
56c0bd4d37 Merge from trunk to branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610853 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 21:10:24 +00:00
Andrew Wang
b066be8115 HDFS-6619. Clean up encryption-related tests. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610849 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 20:59:40 +00:00
Brandon Li
fb1f5bc618 HDFS-6456. NFS should throw error for invalid entry in dfs.nfs.exports.allowed.hosts. Contributed by Abhiraj Butala
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610840 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 20:35:07 +00:00
Jason Darrell Lowe
4dcc08b656 Addendum patch for HADOOP-10468 TestMetricsSystemImpl.testMultiThreadedPublish fails intermediately. Contributed by Akira AJISAKA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610829 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 19:51:55 +00:00
Todd Lipcon
cc57df33b0 Creating development branch for MAPREDUCE-2841
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1610815 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 19:13:13 +00:00
Uma Maheswara Rao G
317542f51f HADOOP-10834. Typo in CredentialShell usage. (Benoy Antony via umamahesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610794 13f79535-47bb-0310-9956-ffa450edef68
2014-07-15 18:22:13 +00:00