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

2476 Commits

Author SHA1 Message Date
Arpit Agarwal 676fc2d1dc HDFS-7723. Quota By Storage Type namenode implemenation. (Contributed by Xiaoyu Yao) 2015-02-12 10:50:14 -08:00
Colin Patrick Mccabe e35788aa5a HDFS-7694. FSDataInputStream should support "unbuffer" (cmccabe) 
(cherry picked from commit 6b39ad0865)
 2015-02-12 10:42:14 -08:00
Jing Zhao 2156e38d5e HDFS-3689. Add support for variable length block. Contributed by Jing Zhao. 
(cherry picked from commit 2848db814a)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirConcatOp.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend3.java
 2015-02-12 10:23:13 -08:00
Kihwal Lee 39594301e1 HDFS-7704. DN heartbeat to Active NN may be blocked and expire if connection to Standby NN continues to time out. Contributed by Rushabh Shah. 
(cherry picked from commit 38262779bb)
 2015-02-12 09:17:10 -06:00
yliu f8d0825f39 HDFS-7761. cleanup unnecssary code logic in LocatedBlock. (yliu) 2015-02-12 03:09:38 +08:00
Tsz-Wo Nicholas Sze 65a6cf47ec HDFS-6133. Add a feature for replica pinning so that a pinned replica will not be moved by Balancer/Mover. Contributed by zhaoyunjiong 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/Receiver.java
 2015-02-11 15:16:34 -08:00
Colin Patrick Mccabe 2ca76df21a HDFS-7771. fuse_dfs should permit FILE: on the front of KRB5CCNAME (cmccabe) 
(cherry picked from commit 50625e660a)
 2015-02-11 12:14:56 -08:00
Haohui Mai 744db47872 HDFS-7736. Fix typos in dfsadmin/fsck/snapshotDiff usage messages. Contributed by Brahma Reddy Battula. 2015-02-11 11:24:44 -08:00
Tsz-Wo Nicholas Sze b49eeddbaf HDFS-7751. Fix TestHDFSCLI for quota with storage type. Contributed by Xiaoyu Yao 2015-02-11 11:10:05 -08:00
Arpit Agarwal 8fa0fc9574 HDFS-7720. Quota by Storage Type API, tools and ClientNameNode Protocol changes. (Contributed by Xiaoyu Yao) 2015-02-11 11:07:53 -08:00
Konstantin V Shvachko 04789db74c HDFS-7760. Document truncate for WebHDFS. Contributed by Konstantin Shvachko. 2015-02-11 10:05:53 -08:00
Konstantin V Shvachko 7f18176cd7 HDFS-7753. Fix Multithreaded correctness Warnings in BackupImage. Contributed by Rakesh R and Konstantin Shvachko. 2015-02-11 00:52:12 -08:00
Tsz-Wo Nicholas Sze acc172e371 HDFS-7769. TestHDFSCLI should not create files in hdfs project root dir. 2015-02-10 17:50:00 -08:00
Konstantin V Shvachko 2b722b904e HDFS-7058. Tests for truncate CLI. Contributed by Dasha Boudnik. 2015-02-09 21:31:02 -08:00
Vinayakumar B a1bf7aecf7 HDFS-7714. Simultaneous restart of HA NameNodes and DataNode can cause DataNode to register successfully with only one NameNode.(Contributed by Vinayakumar B) 
(cherry picked from commit 3d15728ff5)
 2015-02-10 10:45:14 +05:30
Colin Patrick Mccabe 643a8892d1 HDFS-7718. Store KeyProvider in ClientContext to avoid leaking key provider threads when using FileContext (Arun Suresh via Colin P. McCabe) 
(cherry picked from commit 02340a24f2)
 2015-02-09 20:25:31 -08:00
Colin Patrick Mccabe 1465393d14 HDFS-7744. Fix potential NPE in DFSInputStream after setDropBehind or setReadahead is called (cmccabe) 
(cherry picked from commit a9dc5cd706)
 2015-02-09 20:19:48 -08:00
yliu cc0668ebe6 HDFS-7756. Restore method signature for LocatedBlock#getLocations(). (Ted Yu via yliu) 2015-02-10 02:00:32 +08:00
Arpit Agarwal ff900eb64a HDFS-7647. DatanodeManager.sortLocatedBlocks sorts DatanodeInfos but not StorageIDs. (Contributed by Milan Desai) 2015-02-09 12:17:53 -08:00
Jing Zhao 1e49b40f1f HDFS-7743. Code cleanup of BlockInfo and rename BlockInfo to BlockInfoContiguous. Contributed by Jing Zhao. 
(cherry picked from commit 1382ae525c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockCollection.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
 2015-02-08 12:16:09 -08:00
Tsz-Wo Nicholas Sze c5f18ba65b HDFS-7738. Revise the exception message for recover lease; add more truncate tests such as truncate with HA setup, negative tests, truncate with other operations and multiple truncates. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHAAppend.java
 2015-02-07 15:26:06 -08:00
Akira Ajisaka 964a3b0c3e HDFS-7710. Remove dead code in BackupImage.java. Contributed by Xiaoyu Yao. 
(cherry picked from commit cfb829ecd5)
 2015-02-06 19:00:58 -08:00
Akira Ajisaka 2ec796ba80 HDFS-7732. Fix the order of the parameters in DFSConfigKeys. Contributed by Brahma Reddy Battula. 
(cherry picked from commit eaab959a3e)
 2015-02-06 11:28:18 -08:00
yliu e2803f5a51 HDFS-7741. Remove unnecessary synchronized in FSDataInputStream and HdfsDataInputStream. (yliu) 2015-02-06 06:29:52 +08:00
yliu 44d800b353 HDFS-7698. Fix locking on HDFS read statistics and add a method for clearing them. (Colin P. McCabe via yliu) 2015-02-05 23:57:36 +08:00
yliu 3ffe5a1ed2 HDFS-7655. Expose truncate API for Web HDFS. (yliu) 2015-02-05 23:48:55 +08:00
Haohui Mai 67002a5fc0 HDFS-7270. Add congestion signaling capability to DataNode write protocol. Contributed by Haohui Mai. 2015-02-05 11:03:43 -08:00
Tsuyoshi Ozawa 970fdc3ad9 HDFS-7709. Fix findbug warnings in httpfs. Contributed by Rakesh R. 
(cherry picked from commit 20660b7a67)
 2015-02-05 19:57:40 +09:00
Arpit Agarwal 5807afed0a HDFS-7733. NFS: readdir/readdirplus return null directory attribute on failure. (Contributed by Arpit Agarwal) 2015-02-04 16:25:40 -08:00
Colin Patrick Mccabe 76c0757c6e HDFS-7719. BlockPoolSliceStorage#removeVolumes fails to remove some in-memory state associated with volumes. (Lei (Eddy) Xu via Colin P. McCabe) 
(cherry picked from commit 40a415799b)
 2015-02-04 12:46:39 -08:00
Andrew Wang 696266e99c HDFS-7734. Class cast exception in NameNode#main. Contributed by Yi Liu. 
(cherry picked from commit 9175105eea)
 2015-02-04 11:31:49 -08:00
Andrew Wang debd63f0b0 HDFS-7712. Switch blockStateChangeLog to use slf4j. 
(cherry picked from commit 3ae38ec7df)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileAppend3.java
 2015-02-03 15:04:16 -08:00
Kihwal Lee c428d303f6 HDFS-7707. Edit log corruption due to delayed block removal again. Contributed by Yongjun Zhang 
(cherry picked from commit 843806d03a)
 2015-02-03 14:46:24 -06:00
Haohui Mai 7cb70d3447 HDFS-6651. Deletion failure can leak inodes permanently. Contributed by Jing Zhao. 2015-02-02 16:32:56 -08:00
Tsz-Wo Nicholas Sze 8426c7d806 HDFS-7696. In FsDatasetImpl, the getBlockInputStream(..) and getTmpInputStreams(..) methods may leak file descriptors. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2015-02-02 13:42:15 -08:00
Tsz-Wo Nicholas Sze a5568a276d HDFS-7681. Change ReplicaInputStreams constructor to take InputStream(s) instead of FileDescriptor(s). Contributed by Joe Pallas 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-02-02 13:30:07 -08:00
Tsz-Wo Nicholas Sze 2ecfd018f4 HDFS-5782. Change BlockListAsLongs constructor to take Replica as parameter type instead of concrete classes Block and ReplicaInfo. Contributed by David Powell and Joe Pallas 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-02-02 13:24:02 -08:00
Tsz-Wo Nicholas Sze e43b1428b4 HDFS-5631. Change BlockMetadataHeader.readHeader(..), ChunkChecksum class and constructor to public; and fix FsDatasetSpi to use generic type instead of FsVolumeImpl. Contributed by David Powell and Joe Pallas 2015-02-02 12:59:22 -08:00
Andrew Wang fcd23b61e3 HDFS-7706. Switch BlockManager logging to use slf4j. 
(cherry picked from commit 951b3608a8)
 2015-01-30 11:36:02 -08:00
Kihwal Lee 3b030731a0 HDFS-7603. The background replication queue initialization may not let others run. Contributed by Kihwal Lee. 
(cherry picked from commit 89b07490f8)
 2015-01-29 12:37:34 -06:00
yliu dc7950ef18 HDFS-7423. various typos and message formatting fixes in nfs daemon and doc. (Charles Lamb via yliu) 2015-01-29 04:20:14 +08:00
Jing Zhao e8300957a7 HDFS-7611. deleteSnapshot and delete of a file can leave orphaned blocks in the blocksMap on NameNode restart. Contributed by Jing Zhao and Byron Wong. 
(cherry picked from commit d244574d03)
 2015-01-28 15:25:42 -08:00
Andrew Wang 55bb4eca73 HDFS-6673. Add delimited format support to PB OIV tool. Contributed by Eddy Xu. 
(cherry picked from commit caf7298e49)
 2015-01-28 12:36:44 -08:00
Colin Patrick Mccabe ad865b1cd0 HDFS-7675. Remove unused member DFSClient.spanReceiverHost (cmccabe) 
(cherry picked from commit d12dd47f45)
 2015-01-27 20:52:53 -08:00
yliu d483ba25d7 HDFS-7677. DistributedFileSystem#truncate should resolve symlinks. (yliu) 2015-01-27 23:47:52 +08:00
Allen Wittenauer 874e38d81f HDFS-7566. Remove obsolete entries from hdfs-default.xml (Ray Chiang via aw) 2015-01-27 14:32:21 -08:00
Haohui Mai b3a63fa8a2 HDFS-7683. Combine usages and percent stats in NameNode UI. Contributed by Vinayakumar B. 2015-01-27 11:09:42 -08:00
Steve Loughran aa16173a0d HDFS-49. MiniDFSCluster.stopDataNode will always shut down a node in the cluster if a matching name is not found. (stevel) 2015-01-27 11:10:46 +00:00
Kihwal Lee c081fa6ae8 HDFS-7224. Allow reuse of NN connections via webhdfs. Contributed by Eric Payne 
(cherry picked from commit 2b0fa20f69)
 2015-01-26 08:15:37 -06:00
Konstantin V Shvachko 24f0d56afb HDFS-7676. Fix TestFileTruncate to avoid bug of HDFS-7611. Contributed by Konstantin Shvachko. 2015-01-24 18:07:56 -08:00
yliu 5f70b7ecf0 HDFS-7659. truncate should check negative value of the new length. Contributed by Yi Liu. 2015-01-24 17:28:36 -08:00
Konstantin V Shvachko 6b22170bee HDFS-7643. Test case to ensure lazy persist files cannot be truncated. (Contributed by Yi Liu) 2015-01-24 17:28:32 -08:00
yliu 8adffbb2c8 HDFS-7634. Disallow truncation of Lazy persist files. (Contributed by Yi Liu) 2015-01-24 16:34:08 -08:00
yliu 0fdd09a895 HDFS-7638. Small fix and few refinements for FSN#truncate. (yliu) 2015-01-24 16:29:50 -08:00
Konstantin V Shvachko a116e1fe9e HDFS-7606. Fix potential NPE in INodeFile.getBlocks(). Contributed by Byron Wong. 2015-01-24 16:16:58 -08:00
Konstantin V Shvachko 00a7ebab22 HDFS-7056. Snapshot support for truncate. Contributed by Konstantin Shvachko and Plamen Jeliazkov. 2015-01-24 16:06:41 -08:00
Plamen Jeliazkov 6ff9bde714 HDFS-3107. Introduce truncate. Contributed by Plamen Jeliazkov. 2015-01-24 16:01:07 -08:00
Allen Wittenauer 6f89692dc9 HDFS-7644. minor typo in HttpFS doc (Charles Lamb via aw) 2015-01-23 13:47:11 -08:00
cnauroth 639c7b0ddc HDFS-3519. Checkpoint upload may interfere with a concurrent saveNamespace. Contributed by Ming Ma. 2015-01-22 16:03:17 -08:00
Arpit Agarwal dcd14db1a8 HDFS-7575. Fix CHANGES.txt 2015-01-22 14:37:43 -08:00
Kihwal Lee 95858db0c1 HDFS-7548. Corrupt block reporting delayed until datablock scanner thread detects it. Contributed by Rushabh Shah. 2015-01-21 14:42:45 -06:00
Colin Patrick Mccabe 5ec2b6caa9 HDFS-7496. Fix FsVolume removal race conditions on the DataNode by reference-counting the volume instances (Lei (Eddy) Xu via Colin P. McCabe) 
(cherry-picked from commit a17584936c)
 2015-01-21 11:43:42 -08:00
Tsz-Wo Nicholas Sze 1dc5483054 HDFS-3443. Fix NPE when namenode transition to active during startup by adding checkNNStartup() in NameNodeRpcServer. Contributed by Vinayakumar B 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 2015-01-21 11:37:58 -08:00
Colin Patrick Mccabe 7779f38e68 HDFS-7610. Fix removal of dynamically added DN volumes (Lei (Eddy) Xu via Colin P. McCabe) 
(cherry picked from commit a17584936c)
 2015-01-20 20:15:33 -08:00
yliu 7b5aea8175 HDFS-7641. Update archival storage user doc for list/set/get block storage policies. (yliu) 2015-01-21 02:04:03 +08:00
yliu 3f37354daa HDFS-7623. Add htrace configuration properties to core-default.xml and update user doc about how to enable htrace. (yliu) 2015-01-21 00:57:51 +08:00
Haohui Mai 755731a6c1 HDFS-7640. print NFS Client in the NFS log. Contributed by Brandon Li. 2015-01-19 17:29:57 -08:00
Jing Zhao 5da33c5b5d HDFS-7637. Fix the check condition for reserved path. Contributed by Yi Liu. 
(cherry picked from commit e843a0a8ce)
 2015-01-19 10:29:02 -08:00
Haohui Mai 29551e19ef HDFS-7573. Consolidate the implementation of delete() into a single class. Contributed by Haohui Mai. 2015-01-17 12:56:44 -08:00
cnauroth 8e765b8513 HDFS-7632. MiniDFSCluster configures DataNode data directories incorrectly if using more than 1 DataNode and more than 2 storage locations per DataNode. Contributed by Chris Nauroth. 
(cherry picked from commit ec4389cf72)
 2015-01-16 10:52:13 -08:00
cnauroth b3d03980c4 HDFS-7635. Remove TestCorruptFilesJsp from branch-2. Contributed by Chris Nauroth. 2015-01-16 10:40:38 -08:00
Arpit Agarwal f72e2bfedd HDFS-7591. hdfs classpath command should support same options as hadoop classpath. (Contributed by Varun Saxena) 2015-01-16 09:37:54 -08:00
yliu bdbf13ac46 HDFS-7189. Add trace spans for DFSClient metadata operations. (Colin P. McCabe via yliu) 2015-01-16 00:21:38 +08:00
Kihwal Lee 6f792fc198 HDFS-7457. DatanodeID generates excessive garbage. Contributed by Daryn Sharp. 
(cherry picked from commit 780a6bf145)
 2015-01-15 16:45:06 -06:00
Kihwal Lee 0090157fff HDFS-7615. Remove longReadLock. Contributed by Kihwal Lee. 
(cherry picked from commit 44eed6cbc9)
 2015-01-15 16:40:18 -06:00
Tsz-Wo Nicholas Sze 80f2c41ea4 HDFS-2219. Change fsck to support fully qualified paths so that a particular namenode in a federated cluster with multiple namenodes can be specified in the path parameter. 2015-01-14 11:32:38 -08:00
Colin Patrick Mccabe 0578df3baa HDFS-7585. Get TestEnhancedByteBufferAccess working on CPU architectures with page sizes other than 4096 (Sam Liu via Colin P. McCabe) 
(cherry picked from commit 446545c496)
 2015-01-14 11:14:16 -08:00
cnauroth 27eecaef10 HDFS-7570. SecondaryNameNode need twice memory when calling reloadFromImageFile. Contributed by zhaoyunjiong. 
(cherry picked from commit 85aec75ce5)
 2015-01-13 16:10:40 -08:00
Jing Zhao 6e2eb9d5cf HDFS-7600. Refine hdfs admin classes to reuse common code. Contributed by Jing Zhao. 2015-01-12 17:35:44 -08:00
Colin Patrick Mccabe a6ebe7a76b HDFS-5445. PacketReceiver populates the packetLen field in PacketHeader incorrectly (Jonathan Mace via Colin P. McCabe) 
(cherry picked from commit f761bd8fe4)
 2015-01-12 17:11:34 -08:00
Colin Patrick Mccabe dde774f2a4 HDFS-7598. Remove dependency on old version of Guava in TestDFSClientCache#testEviction (Sangjin Lee via Colin P. McCabe) 
(cherry picked from commit b3ddd7ee39)
 2015-01-12 17:08:08 -08:00
Kihwal Lee 33534a0c9a HDFS-7533. Datanode sometimes does not shutdown on receiving upgrade shutdown command. Contributed by Eric Payne. 
(cherry picked from commit 6bbf9fdd04)
 2015-01-12 15:38:17 -06:00
Colin Patrick Mccabe e4bb94b0b8 HDFS-7326. Add documentation for hdfs debug commands (Vijay Bhat via Colin P. McCabe) 
(cherry picked from commit b78b4a1536)
 2015-01-12 12:17:37 -08:00
yliu cce7ab4721 HDFS-7323. Move the get/setStoragePolicy commands out from dfsadmin. (jing9 via yliu) 2015-01-12 00:45:27 +08:00
cnauroth 75e4e55e12 HDFS-7596. NameNode should prune dead storages from storageMap. Contributed by Arpit Agarwal. 
(cherry picked from commit ef3c3a832c)
 2015-01-10 09:18:41 -08:00
Jing Zhao 4b589e7cfa HDFS-7182. JMX metrics aren't accessible when NN is busy. Contributed by Ming Ma. 2015-01-09 17:36:30 -08:00
Colin Patrick Mccabe a663faf741 HADOOP-11470. Remove some uses of obsolete guava APIs from the hadoop codebase (Sangjin Lee via Colin P. McCabe) 
(cherry picked from commit ae91b13a4b)
 2015-01-08 16:26:11 -08:00
cnauroth f0acb7c2a2 HDFS-7579. Improve log reporting during block report rpc failure. Contributed by Charles Lamb. 
(cherry picked from commit 7e2d9a3242)
 2015-01-08 15:13:05 -08:00
cnauroth 501246e24a HDFS-7589. Break the dependency between libnative_mini_dfs and libhdfs. Contributed by Zhanwei Wang. 
(cherry picked from commit 708b1aa074)
 2015-01-08 10:23:53 -08:00
Tsuyoshi Ozawa 132fd6ba58 HADOOP-11032. Replace use of Guava's Stopwatch with Hadoop's StopWatch. (ozawa) 
(cherry picked from commit a6ed4894b5)

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/kvtest/KVJob.java
 2015-01-08 15:00:02 +09:00
Konstantin V Shvachko c3c3bb2b02 HDFS-7561. TestFetchImage should write fetched-image-dir under target. Contributed by Liang Xie. 2015-01-07 16:07:16 -08:00
Brandon Li 36367209a1 HDFS-7564. NFS gateway dynamically reload UID/GID mapping file /etc/nfs.map. Contributed by Yongjun Zhang 
(cherry picked from commit 788ee35e2b)
 2015-01-06 16:20:39 -08:00
Vinayakumar B 53ecb63587 HDFS-7583. Fix findbug in TransferFsImage.java (Contributed by Vinayakumar B) 
(cherry picked from commit 4cd66f7fb2)
 2015-01-06 09:32:56 +05:30
cnauroth 60418c9b2d HDFS-7572. TestLazyPersistFiles#testDnRestartWithSavedReplicas is flaky on Windows. Contributed by Arpit Agarwal. 
(cherry picked from commit dfd2589bcb)
 2015-01-05 10:39:38 -08:00
Brandon Li 05df432fab HDFS-7563. NFS gateway parseStaticMap NumberFormatException. Contributed by Yongjun Zhang 
(cherry picked from commit 892b1bb746)
 2015-01-02 10:50:51 -08:00
Jing Zhao 9aa9455dab HDFS-7484. Make FSDirectory#addINode take existing INodes as its parameter. Contributed by Jing Zhao. 2014-12-22 23:20:18 -08:00
Vinayakumar B cd8e78d50f HDFS-7456. De-duplicate AclFeature instances with same AclEntries do reduce memory footprint of NameNode (Contributed by Vinayakumar B) 
(cherry picked from commit 50ae1a6664)
 2014-12-23 12:37:16 +05:30
cnauroth 5486124668 HDFS-7560. ACLs removed by removeDefaultAcl() will be back after NameNode restart/failover. Contributed by Vinayakumar B. 
(cherry picked from commit 2cf90a2c33)
 2014-12-22 14:02:49 -08:00
yliu 7e49c99ead HDFS-7557. Fix spacing for a few keys in DFSConfigKeys.java (Colin P. McCabe) 2014-12-22 00:57:18 +08:00
Colin Patrick Mccabe bcaf15e2fa HDFS-7443. Datanode upgrade to BLOCKID_BASED_LAYOUT fails if duplicate block files are present in the same volume (cmccabe) 
(cherry picked from commit 8fa265a290)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
 2014-12-19 13:19:52 -08:00