Commit Graph

2665 Commits

Author SHA1 Message Date
Todd Lipcon 0aa09f6d5a HDFS-5399. Revisit SafeModeException and corresponding retry policies. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564629 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 04:18:31 +00:00
Brandon Li cd1e8d2e34 HDFS-5791. TestHttpsFileSystem should use a random port to avoid binding error during testing. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564198 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 05:11:11 +00:00
Brandon Li 6439cd0f69 HDFS-5767. NFS implementation assumes userName userId mapping to be unique, which is not true sometimes. Contributed by Yongjun Zhang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1564141 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 00:27:25 +00:00
Junping Du 94b512bc51 HDFS-5828. BlockPlacementPolicyWithNodeGroup can place multiple replicas on the same node group when dfs.namenode.avoid.write.stale.datanode is true. (Buddy via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563640 13f79535-47bb-0310-9956-ffa450edef68
2014-02-02 15:39:02 +00:00
Chris Nauroth 0abf8e58b7 HDFS-5861. Add CLI test for Ls output for extended ACL marker. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563375 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 05:58:31 +00:00
Chris Nauroth 3fd9f29d56 HDFS-5860. Refactor INodeDirectory getDirectoryXFeature methods to use common getFeature helper method. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563374 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 05:55:20 +00:00
Colin McCabe 140246bad8 HDFS-5746. Add ShortCircuitSharedMemorySegment (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563362 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 02:25:33 +00:00
Colin McCabe f6bfe98639 HDFS-5859. DataNode#checkBlockToken should check block tokens even if security is not enabled (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563328 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:08:23 +00:00
Chris Nauroth 9e8cabf8ce Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563327 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:05:23 +00:00
Chris Nauroth fa99a8471d HDFS-5858. Refactor common ACL test cases to be run through multiple FileSystem implementations. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563325 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:02:45 +00:00
Jing Zhao 1f7dd7811a HDFS-5804. HDFS NFS Gateway fails to mount and proxy when using Kerberos. Contributed by Abin Shahab.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563323 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:00:34 +00:00
Chris Nauroth 14f1f76bf6 HDFS-5614. NameNode: implement handling of ACLs in combination with snapshots. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563304 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 22:21:19 +00:00
Arpit Agarwal 5beeb30169 HDFS-5153. Datanode should send block reports for each storage in a separate message. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563254 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 21:00:33 +00:00
Chris Nauroth d5f4f76a23 HADOOP-10270. getfacl does not display effective permissions of masked. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563219 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 18:59:16 +00:00
Chris Nauroth c654c2e8b9 HDFS-5849. Removing ACL from an inode fails if it has only a default ACL. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563205 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 18:33:56 +00:00
Suresh Srinivas 7039b776c6 HDFS-5856. DataNode.checkDiskError might throw NPE. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1563064 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 05:35:30 +00:00
Chris Nauroth 7a03dc0482 HDFS-5608. WebHDFS: implement ACL APIs. Contributed by Sachin Jose and Renil Joseph.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1563013 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 23:13:24 +00:00
Todd Lipcon fd2ba4911b HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562970 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 21:21:15 +00:00
Jing Zhao 3d9ad8e3b6 HDFS-5843. DFSClient.getFileChecksum() throws IOException if checksum is disabled. Contributed by Laurent Goujon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562927 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 19:15:13 +00:00
Arpit Agarwal 0f3461e489 HDFS-5492. Port HDFS-2069 (Incorrect default trash interval in the docs) to trunk. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562683 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 03:26:46 +00:00
Chris Nauroth 10ef8a4b56 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1562670 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 01:55:14 +00:00
Chris Nauroth 4b4241c06d HDFS-5702. FsShell Cli: Add XML based End-to-End test for getfacl and setfacl commands. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1562668 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 01:46:19 +00:00
Andrew Wang 504b0d6f54 Update CHANGES.txt to move HDFS-5842 to 2.3.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562656 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 00:31:56 +00:00
Andrew Wang 799ad3d670 HDFS-5841. Update HDFS caching documentation with new changes. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562649 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 00:17:16 +00:00
Andrew Wang c96d078033 HDFS-5845. SecondaryNameNode dies when checkpointing with cache pools.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562644 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 23:59:21 +00:00
Andrew Wang ed551ff3c6 Update HDFS and Common CHANGES.txt post branch-2.3 reswizzle.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562632 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 23:17:07 +00:00
Jing Zhao 8c505adddb HDFS-5842. Cannot create hftp filesystem when using a proxy user ugi and a doAs on a secure cluster. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562603 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 21:53:32 +00:00
Arpit Agarwal d9d8027eb3 HDFS-5844. Fix broken link in WebHDFS.apt.vm (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562357 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 04:58:13 +00:00
Suresh Srinivas 33a47743a5 HADOOP-10255. Rename HttpServer to HttpServer2 to retain older HttpServer in branch-2 for compatibility. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561959 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:32:52 +00:00
Arpit Agarwal b8776ee65b HDFS-5833. Fix incorrect javadoc in SecondaryNameNode. (Contributed by Bangtao Zhou)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561938 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 05:09:57 +00:00
Colin McCabe 07c004db06 HDFS-5830. WebHdfsFileSystem.getFileBlockLocations throws IllegalArgumentException when accessing another cluster. (Yongjun Zhang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561885 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 22:19:30 +00:00
Arpit Agarwal c5286c7737 HDFS-5297. Fix dead links in HDFS site documents. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561849 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 21:11:53 +00:00
Arpit Agarwal 55407fea25 Fix correct CHANGES.txt for HADOOP-10086 and HADOOP-9982.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561819 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 20:00:38 +00:00
Arpit Agarwal e9f7f3624a HADOOP-9982. Fix dead links in hadoop site docs. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561813 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 19:51:08 +00:00
Arpit Agarwal 70165d84eb HDFS-5825. Use FileUtils.copyFile() to implement DFSTestUtils.copyFile(). (Contributed by Haohui Mai)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561792 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 19:01:19 +00:00
Jing Zhao 4b61ff2283 HDFS-5781. Use an array to record the mapping between FSEditLogOpCode and the corresponding byte value. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561788 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:53:39 +00:00
Arpit Agarwal 0be0174669 HADOOP-10086. User document for authentication in secure cluster. (Contributed by Masatake Iwasaki)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561776 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:32:52 +00:00
Chris Nauroth ad240d6b3a Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1561771 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:09:22 +00:00
Chris Nauroth b98b344b9a HADOOP-10277. setfacl -x fails to parse ACL spec if trying to remove the mask entry. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1561769 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:03:30 +00:00
Todd Lipcon edb6dc5f30 HDFS-5138. Support HDFS upgrade in HA. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561381 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 20:01:26 +00:00
Uma Maheswara Rao G befb254e61 HDFS-5343. When cat command is issued on snapshot files, getting unexpected result. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561325 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 15:50:42 +00:00
Kihwal Lee dd1bc7e1c7 HDFS-5728. Block recovery will fail if the metafile does not have crc for all chunks of the block. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561223 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 22:56:05 +00:00
Chris Nauroth 738b076cc6 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1560768 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:49:24 +00:00
Chris Nauroth cd7cd94e3f HDFS-5799. Make audit logging consistent across ACL APIs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1560766 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:41:53 +00:00
Daryn Sharp a4e66e09e9 HDFS-5241. Provide alternate queuing audit logger to reduce logging contention (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560761 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:15:27 +00:00
Kihwal Lee ff43021946 HDFS-5788. listLocatedStatus response can be very large. Contributed by Nathan Roberts.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560750 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:01:30 +00:00
Uma Maheswara Rao G 824dcdbd42 HDFS-5789. Some of snapshot APIs missing checkOperation double check in fsn. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560731 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 16:35:05 +00:00
Andrew Wang 1c602f7198 HDFS-5806. Balancer should set soTimeout to avoid indefinite hangs. Contributed by Nathan Roberts.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560548 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 22:33:00 +00:00
Andrew Wang 2de391de9f Move HDFS-4949 subtasks in CHANGES.txt to a new section under 2.4.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560528 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 21:52:56 +00:00
Alejandro Abdelnur 5e09ae1633 HDFS-5703. Add support for HTTPS and swebhdfs to HttpFS. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560504 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 20:38:24 +00:00
Arpit Agarwal 83280a45de HDFS-5434. Change block placement policy constructors from package private to protected. (Buddy Taylor via Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560217 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 23:11:15 +00:00
Brandon Li cc7cc5a4d9 HDFS-5748. Too much information shown in the dfs health page. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1560215 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 22:55:35 +00:00
Haohui Mai 21a5bc7f2c HADOOP-10241. Clean up output of FsShell getfacl. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1560194 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 21:20:39 +00:00
Haohui Mai 2af05fb1cf HDFS-5615. NameNode: implement handling of ACLs in combination with sticky bit. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1560131 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 18:33:02 +00:00
Haohui Mai 9df33876ff HDFS-5613. NameNode: implement handling of ACLs in combination with symlinks. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559804 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 18:47:30 +00:00
Chris Nauroth 2fbe8235dc Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559794 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 18:02:27 +00:00
Chris Nauroth cae96dfe6e HADOOP-10213. Fix bugs parsing ACL spec in FsShell setfacl. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559793 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 18:00:06 +00:00
Tsz-wo Sze 602f71a8da HDFS-5800. Fix a typo in DFSClient.renewLease(). Contributed by Kousuke Saruta
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559701 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 14:08:00 +00:00
Chris Nauroth 8a9a6dbd7e Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559324 13f79535-47bb-0310-9956-ffa450edef68
2014-01-18 06:50:19 +00:00
Haohui Mai 6a52febfbd HDFS-5612. NameNode: change all permission checks to enforce ACLs in addition to permissions. Contributued by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559281 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 23:28:45 +00:00
Haohui Mai 5300294fbe HDFS-5758. NameNode: complete implementation of inode modifications for ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1559267 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 22:05:47 +00:00
Jing Zhao ebb9a704bd Move HDFS-5704 and HDFS-5777 to the correct section in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559210 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 18:29:38 +00:00
Jing Zhao fb01200153 HDFS-5794. Fix the inconsistency of layout version number of ADD_DATANODE_AND_STORAGE_UUIDS between trunk and branch-2. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559209 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 18:18:36 +00:00
Colin McCabe a7ec44d41b HDFS-5784. Reserve space in edit log header and fsimage header for feature flag section (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558974 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 01:32:05 +00:00
Jing Zhao e02ded811f HDFS-5777. Update LayoutVersion for the new editlog op OP_ADD_BLOCK. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558675 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 02:28:10 +00:00
Brandon Li a506df8e48 HDFS-5775. Consolidate the code for serialization in CacheManager. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558599 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 23:15:24 +00:00
Brandon Li ca5d73d1ab HDFS-5768. Consolidate the serialization code in DelegationTokenSecretManager. Contributed by Haohui Mai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558598 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 23:11:01 +00:00
Colin McCabe c3b236ce5d HDFS-5766. In DFSInputStream, do not add datanode to deadNodes after InvalidEncryptionKeyException in fetchBlockByteRange (Liang Xie via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558536 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 19:23:31 +00:00
Colin McCabe 037a89abc5 HDFS-5762. BlockReaderLocal does not return -1 on EOF when doing zero-length reads (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558526 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 19:17:50 +00:00
Jing Zhao 578dae9ef3 HDFS-5704. Change OP_UPDATE_BLOCKS with a new OP_ADD_BLOCK. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558255 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 01:06:53 +00:00
Konstantin Boudnik 4b16c2b65e HDFS-5677. Need error checking for HA cluster configuration. Contributed by Vincent Sheffer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558217 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 21:59:51 +00:00
Konstantin Boudnik 0b6a236258 Adding 2.0.6-alpha release to the CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558215 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 21:49:59 +00:00
Jing Zhao e210519d32 HDFS-5579. Under construction files make DataNode decommission take very long hours. Contributed by zhaoyunjiong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557904 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 02:02:15 +00:00
Jing Zhao e06ae2d567 HDFS-5710. FSDirectory#getFullPathName should check inodes against null. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557803 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:37:56 +00:00
Chris Nauroth c90211af7a Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1557294 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:37:23 +00:00
Chris Nauroth f065f58292 HADOOP-10220. Add ACL indicator bit to FsPermission. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1557293 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:36:00 +00:00
Arpit Agarwal 9d382a4174 HDFS-5747. Fix NPEs in BlockManager. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557289 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:05:55 +00:00
Andrew Wang 7354547a02 HDFS-5756. hadoopRzOptionsSetByteBufferPool does not accept NULL argument, contrary to docs. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1557244 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:10:44 +00:00
Kihwal Lee b4d6c5823b HDFS-5449. WebHdfs compatibility broken between 2.2 and 1.x / 23.x. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556927 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 19:24:07 +00:00
Junping Du 7186000367 HDFS-5721. sharedEditsImage in Namenode#initializeSharedEdits() should be closed before method returns. (Ted Yu via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556803 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 13:33:08 +00:00
Chris Nauroth 17ab35314f Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556665 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 23:10:02 +00:00
Chris Nauroth 21d4167179 HDFS-5739. ACL RPC must allow null name or unspecified permissions in ACL entries. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556663 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 22:47:57 +00:00
Chris Nauroth 023c11ec7e HDFS-5737. Replacing only the default ACL can fail to copy unspecified base entries from the access ACL. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556652 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 22:02:53 +00:00
Jing Zhao 076ecf79ca HDFS-5726. Fix compilation error in AbstractINodeDiff for JDK7. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556433 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 03:19:41 +00:00
Brandon Li 1be8ee2424 HDFS-5649. Unregister NFS and Mount service when NFS gateway is shutting down. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556405 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 23:43:04 +00:00
Colin McCabe 53b27fc60b HDFS-5724. modifyCacheDirective logging audit log command wrongly as addCacheDirective (Uma Maheswara Rao G via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556386 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 22:27:06 +00:00
Jing Zhao 70cff9e2f0 HDFS-5715. Use Snapshot ID to indicate the corresponding Snapshot for a FileDiff/DirectoryDiff. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556353 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 20:52:48 +00:00
Chris Nauroth 2fbb3d694e Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556097 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 01:07:33 +00:00
Chris Nauroth c658567571 HDFS-5673. Implement logic for modification of ACLs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556090 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:47:49 +00:00
Arpit Agarwal 5241aa4cdd HDFS-2832. Update CHANGES.txt to reflect merge to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556088 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:40:59 +00:00
Brandon Li bfd227bf09 HDFS-5719. FSImage#doRollback() should close prevState before return. Contributed by Ted Yu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1556057 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 22:58:18 +00:00
Colin McCabe 8deb7a6057 HDFS-5589. Namenode loops caching and uncaching when data should be uncached. (awang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555996 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 19:45:02 +00:00
Colin McCabe 2a1ecd00da HDFS-5220. Expose group resolution time as metric (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555976 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 18:59:10 +00:00
Arpit Agarwal 410f3a9f60 HDFS-5667. Add test missed in previous checkin
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555956 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 18:14:05 +00:00
Arpit Agarwal f8a9329f2b HDFS-5667. Include DatanodeStorage in StorageReport. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555929 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 17:28:23 +00:00
Brandon Li b80343a55f HDFS-5705. TestSecondaryNameNodeUpgrade#testChangeNsIDFails may fail due to ConcurrentModificationException. Contributed by Ted Yu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555190 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 18:29:44 +00:00
Jing Zhao 71e6ea4be1 HDFS-5695. Clean up TestOfflineEditsViewer and OfflineEditsViewerHelper. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555164 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 17:36:16 +00:00
Andrew Wang d85c017d04 HDFS-5651. Remove dfs.namenode.caching.enabled and improve CRM locking. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555002 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 02:45:53 +00:00
Andrew Wang b4eb963c3c HDFS-5659. dfsadmin -report doesn't output cache information properly. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554893 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 20:11:41 +00:00
Andrew Wang 07e4fb1455 HDFS-5708. The CacheManager throws a NPE in the DataNode logs when processing cache reports that refer to a block not known to the BlockManager. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554594 13f79535-47bb-0310-9956-ffa450edef68
2014-01-01 00:01:12 +00:00
Uma Maheswara Rao G 97e881b955 HDFS-5671. Fix socket leak in DFSInputStream#getBlockReader. Contributed by JamesLi
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554553 13f79535-47bb-0310-9956-ffa450edef68
2013-12-31 16:24:02 +00:00
Andrew Wang 7f86c8114e HDFS-5701. Fix the CacheAdmin -addPool -maxTtl option name. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554305 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 20:02:36 +00:00
Colin McCabe e596f17734 HDFS-5582. hdfs getconf -excludeFile or -includeFile always failed (satish via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554295 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 19:35:43 +00:00
Andrew Wang c179d58eee Add updated editsStored files missing from initial HDFS-5636 commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554293 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 19:02:08 +00:00
Konstantin Shvachko 5a54b91df9 HDFS-5675. Add Mkdirs operation to NNThroughputBenchmark. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554071 13f79535-47bb-0310-9956-ffa450edef68
2013-12-29 21:22:04 +00:00
Chris Nauroth 29dac1d629 HADOOP-10192. FileSystem#getAclStatus has incorrect JavaDocs. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553737 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 21:00:21 +00:00
Chris Nauroth abe13d6ffb HADOOP-10187. add getfacl and setfacl with minimal support for getting and setting ACLs. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553735 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 20:41:16 +00:00
Chris Nauroth 839512aab7 Update CHANGES-HDFS-4685.txt for several issues that have been converted to Hadoop Common sub-tasks of HADOOP-10184.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553602 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 23:09:17 +00:00
Chris Nauroth eaa5321619 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553226 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 22:19:12 +00:00
Chris Nauroth c3b56ed1c8 HDFS-5619. NameNode: record ACL modifications to edit log. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553224 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 22:12:45 +00:00
Chris Nauroth 25e9d2e895 HDFS-5618. NameNode: persist ACLs in fsimage. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553221 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 21:45:03 +00:00
Jing Zhao e8de319789 HDFS-5690. DataNode fails to start in secure mode when dfs.http.policy equals to HTTP_ONLY. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1553167 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 18:23:43 +00:00
Colin McCabe b9ae3087c0 HDFS-5636. Enforce a max TTL per cache pool (awang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552841 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 23:27:20 +00:00
Arpit Agarwal 86e5db39ba HDFS-2933. Fix incorrect target version in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552837 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 23:02:04 +00:00
Suresh Srinivas 17a3d72d3b HDFS-5691. Fix typo in ShortCircuitLocalRead document. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552802 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 20:07:46 +00:00
Kihwal Lee 04d139e2a0 HDFS-5681. renewLease should not hold fsn write lock. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552711 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 16:05:03 +00:00
Chris Nauroth 72b0b1881f Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1552467 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 01:01:18 +00:00
Chris Nauroth c552d5d72e HDFS-5685. Implement ACL as a INode feature. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1552465 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 00:48:24 +00:00
Andrew Wang c7153e182a HDFS-5679. TestCacheDirectives should handle the case where native code is not available. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552461 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 00:00:45 +00:00
Junping Du 42e7446add HDFS-5540. Fix intermittent failure in TestBlocksWithNotEnoughRacks. (Binglin Chang via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552256 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 09:21:19 +00:00
Michael Stack d4e1081566 HDFS-5663 make the retry time and interval value configurable in openInfo()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552237 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 06:15:09 +00:00
Michael Stack b0947f9305 HDFS-5663 make the retry time and interval value configurable in openInfo()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552232 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 05:21:46 +00:00
Jing Zhao a9d80ae59d HDFS-5661. Browsing FileSystem via web ui, should use datanode's fqdn instead of ip address. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552177 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 00:27:16 +00:00
Colin McCabe 90122f25e1 HDFS-5676. fix inconsistent synchronization of CachingStrategy (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552162 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 23:29:05 +00:00
Brandon Li fc966461e0 HDFS-5662. Can't decommission a DataNode due to file's replication factor larger than the rest of the cluster size. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552131 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 22:26:33 +00:00
Tsz-wo Sze 504bd0bca3 HDFS-5674. Editlog code cleanup: remove @SuppressWarnings("deprecation") in FSEditLogOp; change FSEditLogOpCodes.fromByte(..) to be more efficient; and change Some fields in FSEditLog to final.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551812 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 02:46:00 +00:00
Jing Zhao 7f53e90fd1 Move HDFS-5538, HDFS-5545, HDFS-5536, HDFS-5312, and HDFS-5629 from trunk to 2.4.0 section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551724 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:36:30 +00:00
Colin McCabe 124e507674 HDFS-5634. Allow BlockReaderLocal to switch between checksumming and not (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551701 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:57:00 +00:00
Brandon Li 5792d59da3 HDFS-5657. race condition causes writeback state error in NFS gateway. Contributed by Brandon Li
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551691 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:40:15 +00:00
Colin McCabe 991c453ca3 HDFS-5431. Support cachepool-based limit management in path-based caching. (awang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551651 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 18:47:04 +00:00
Andrew Wang 0fc2929d13 HDFS-5350. Name Node should report fsimage transfer time as a metric. Contributed by Jimmy Xiang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551415 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 00:30:06 +00:00
Chris Nauroth 740605cde6 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1551332 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 20:08:58 +00:00
Colin McCabe 8e32e6aff1 HDFS-5666. Fix inconsistent synchronization in BPOfferService (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551301 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 18:35:40 +00:00
Arpit Agarwal 89a374afcb HDFS-5454. DataNode UUID should be assigned prior to FsDataset initialization. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551296 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 18:16:56 +00:00
Andrew Wang 6c641339d1 HDFS-5665. Remove the unnecessary writeLock while initializing CacheManager in FsNameSystem Ctor. (Uma Maheswara Rao G via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551270 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 17:12:55 +00:00
Uma Maheswara Rao G 1dabd42999 HDFS-5592. statechangeLog of completeFile should be logged only in case of success. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551145 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 09:53:57 +00:00
Arpit Agarwal 121137789c HDFS-5406. Add file missed in previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551110 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 04:05:53 +00:00
Arpit Agarwal 938565925a HDFS-5406. Send incremental block reports for all storages in a single call.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551093 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 00:58:40 +00:00
Tsz-wo Sze 44a6560b5d HDFS-5632. Flatten INodeDirectory hierarchy: Replace INodeDirectoryWithSnapshot with DirectoryWithSnapshotFeature. Contributed by jing9
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550917 13f79535-47bb-0310-9956-ffa450edef68
2013-12-14 10:13:30 +00:00
Chris Nauroth f24e0c1563 Merge trunk to HDFS-4685.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1550774 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 17:28:14 +00:00
Junping Du a31a3a68ea HDFS-5652. Refactor invalid block token exception handling in DFSInputStream. (Liang Xie via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550620 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 02:47:04 +00:00
Chris Nauroth 9263f3bb14 HDFS-5596. Implement RPC stubs. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1550544 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 21:47:46 +00:00
Jing Zhao 5fd7230671 HDFS-5647. Merge INodeDirectory.Feature and INodeFile.Feature. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550469 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 18:26:40 +00:00
Arpit Agarwal 329093ae1b HDFS-2832: Update binary file editsStored for TestOfflineEditsViewer
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550364 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 07:47:09 +00:00
Arpit Agarwal 93511259ba Update CHANGES.txt in preparation for merging branch HDFS-2832 to trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1550361 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 07:07:05 +00:00
Arpit Agarwal fba994ffe2 HDFS-5648. Get rid of FsDatasetImpl#perVolumeReplicaMap.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1550357 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 07:01:24 +00:00
Arpit Agarwal c656562556 Merging r1550313 through r1550355 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1550356 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 06:51:54 +00:00
Junping Du 8373c4134a HDFS-5637. Try to refeatchToken while local read InvalidToken occurred. (Liang Xie via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550335 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 03:04:43 +00:00
Arpit Agarwal cd083aa807 Merging r1549949 through r1550312 from trunk to branch HDFS-2832
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1550313 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 23:18:29 +00:00
Colin McCabe 9678020e59 HDFS-4201. NPE in BPServiceActor#sendHeartBeat (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550269 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 21:30:16 +00:00