Commit Graph

2866 Commits

Author SHA1 Message Date
Jing Zhao 368ab2cd37 HDFS-7898. Change TestAppendSnapshotTruncate to fail-fast. Contributed by Tsz Wo Nicholas Sze.
(cherry picked from commit e43882e84a)
(cherry picked from commit c7105fcff0)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-03-10 10:31:41 -07:00
Akira Ajisaka c9a2e6f5db HDFS-6806. HDFS Rolling upgrade document should mention the versions available. Contributed by J.Andreina.
(cherry picked from commit 82db3341bf)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-03-10 11:27:30 +09:00
Tsuyoshi Ozawa 28f4e6b222 HADOOP-11602. Backport 'Fix toUpperCase/toLowerCase to use Locale.ENGLISH.' (ozawa)
(cherry picked from commit b46f9e72db)
2015-03-09 19:54:45 +09:00
Chris Douglas 3bc4f3502a HDFS-7411. Change decommission logic to throttle by blocks rather
than nodes in each interval. Contributed by Andrew Wang
2015-03-08 18:32:20 -07:00
Brandon Li c8af3b2768 HDFS-6488. Support HDFS superuser in NFSv3 gateway. Contributed by Brandon Li
(cherry picked from commit 0f8ecb1d0c)
2015-03-06 15:22:20 -08:00
Haohui Mai ab251fd355 HDFS-7818. OffsetParam should return the default value instead of throwing NPE when the value is unspecified. Contributed by Eric Payne. 2015-03-06 14:26:47 -08:00
Jing Zhao 994dadb9ba HDFS-7885. Datanode should not trust the generation stamp provided by client. Contributed by Tsz Wo Nicholas Sze.
(cherry picked from commit 24db0812be)
2015-03-06 10:57:38 -08:00
Jing Zhao c5d52c7b52 HDFS-7855. Separate class Packet from DFSOutputStream. Contributed by Li Bo.
(cherry picked from commit 952640fa4c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
2015-03-05 11:11:08 -08:00
Tsuyoshi Ozawa f805d48b19 HADOOP-11648. Set DomainSocketWatcher thread name explicitly. Contributed by Liang Xie.
(cherry picked from commit 74a4754d1c)
2015-03-05 16:06:37 +09:00
Tsz-Wo Nicholas Sze f9a2007aff HDFS-7746. Add a test randomly mixing append, truncate and snapshot operations. 2015-03-05 10:23:14 +08:00
Dongming Liang ada545d3b7 HDFS-1522. Combine two BLOCK_FILE_PREFIX constants into one. Contributed by Dongming Liang. 2015-03-04 17:52:25 -08:00
Kihwal Lee f85530f649 HDFS-7434. DatanodeID hashCode should not be mutable. Contributed by Daryn Sharp.
(cherry picked from commit 722b479469)
2015-03-04 17:23:00 -06:00
Jing Zhao b2ccf54c14 HDFS-7535. Utilize Snapshot diff report for distcp. Contributed by Jing Zhao.
(cherry picked from commit ed70fa142c)
2015-03-04 10:32:39 -08:00
Haohui Mai d020544ef6 HDFS-7879. hdfs.dll does not export functions of the public libhdfs API. Contributed by Chris Nauroth. 2015-03-04 09:17:29 -08:00
Vinayakumar B c24448c27b HDFS-7869. Inconsistency in the return information while performing rolling upgrade ( Contributed by J.Andreina )
(cherry picked from commit 3560180b6e)
2015-03-04 14:39:51 +05:30
Akira Ajisaka 31b3f84601 HADOOP-11666. Revert the format change of du output introduced by HADOOP-6857. Contributed by Byron Wong. 2015-03-03 21:46:28 -08:00
Aaron T. Myers bce3d442ff HDFS-7682. {{DistributedFileSystem#getFileChecksum}} of a snapshotted file includes non-snapshotted content. Contributed by Charles Lamb.
(cherry picked from commit f2d7a67a2c)
2015-03-03 18:09:31 -08:00
Haohui Mai 65bfde552a HDFS-6565. Use jackson instead jetty json in hdfs-client. Contributed by Akira AJISAKA. 2015-03-03 17:58:21 -08:00
Arpit Agarwal 7e6624c218 HDFS-7757. Misleading error messages in FSImage.java. (Contributed by Brahma Reddy Battula) 2015-03-03 10:55:32 -08:00
Jing Zhao 6090f51725 HDFS-7871. NameNodeEditLogRoller can keep printing 'Swallowing exception' message. Contributed by Jing Zhao.
(cherry picked from commit b442aeec95)
2015-03-02 20:23:10 -08:00
Haohui Mai 651aa8761e HDFS-7785. Improve diagnostics information for HttpPutFailedException. Contributed by Chengbing Liu. 2015-03-02 15:35:19 -08:00
Gera Shegalov 52d0724a20 HDFS-7789. DFSck should resolve the path to support cross-FS symlinks. (gera)
(cherry picked from commit cbb492578e)
2015-03-02 01:05:15 -08:00
Tsz-Wo Nicholas Sze a5f3156b30 HDFS-7439. Add BlockOpResponseProto's message to the exception messages. Contributed by Takanobu Asanuma 2015-03-02 15:05:06 +08:00
Akira Ajisaka d664705fd1 HDFS-5853. Add "hadoop.user.group.metrics.percentiles.intervals" to hdfs-default.xml (aajisaka)
(cherry picked from commit aa55fd3096)
2015-03-01 01:18:36 -08:00
Tsz-Wo Nicholas Sze c52636df3f recommit "HDFS-7769. TestHDFSCLI should not create files in hdfs project root dir."
(cherry picked from commit acc172e371)
2015-02-27 14:20:26 -08:00
Akira Ajisaka 0f9289e848 HDFS-7685. Document dfs.namenode.heartbeat.recheck-interval in hdfs-default.xml. Contributed by Kai Sasaki.
(cherry picked from commit 8719cdd4f6)
2015-02-27 12:18:46 -08:00
Tsz-Wo Nicholas Sze 657b027bb2 HDFS-7308. Change the packet chunk size computation in DFSOutputStream in order to enforce packet size <= 64kB. Contributed by Takuya Fukudome 2015-02-27 23:46:42 +08:00
Vinayakumar B bc60404eaf HDFS-6753. Initialize checkDisk when DirectoryScanner not able to get files list for scanning (Contributed by J.Andreina)
(cherry picked from commit 4f75b15628)
2015-02-27 16:37:03 +05:30
Tsz-Wo Nicholas Sze d223a4a594 Revert "HDFS-7769. TestHDFSCLI should not create files in hdfs project root dir."
This reverts commit acc172e371.

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-02-27 18:27:19 +08:00
cnauroth 5dfb793b05 HDFS-7774. Unresolved symbols error while compiling HDFS on Windows 7/32 bit. Contributed by Kiran Kumar M R.
(cherry picked from commit c6d5b37a1c)
2015-02-26 13:37:58 -08:00
Colin Patrick Mccabe 8b3b9568b6 HDFS-7819. Log WARN message for the blocks which are not in Block ID based layout (Rakesh R via Colin P. McCabe)
(cherry picked from commit f0c980abed)
2015-02-26 12:03:11 -08:00
Vinayakumar B f0f3d1937d HDFS-7832. Show 'Last Modified' in Namenode's 'Browse Filesystem' (Contributed by Vinayakumar B)
(cherry picked from commit 166eecf687)
2015-02-26 14:37:03 +05:30
Tsz-Wo Nicholas Sze 22b13a0ddb HDFS-7537. Add "UNDER MIN REPL'D BLOCKS" count to fsck. Contributed by GAO Rui 2015-02-26 11:47:04 +08:00
Tsz-Wo Nicholas Sze 12fe3afcd3 HDFS-7843. A truncated file is corrupted after rollback from a rolling upgrade. 2015-02-26 10:15:49 +08:00
Benoy Antony 4e400030f6 HDFS-7467. Provide storage tier information for a directory via fsck. (Benoy Antony) 2015-02-25 16:46:41 -08:00
Colin Patrick Mccabe d389a1ae98 HDFS-7495. Remove updatePosition argument from DFSInputStream#getBlockAt() (cmccabe)
(cherry picked from commit caa42adf20)
2015-02-25 13:39:02 -08:00
Colin Patrick Mccabe 5c0073e706 HDFS-7668. Backport "Convert site documentation from apt to markdown" to branch-2 (Masatake Iwasaki via Colin P. McCabe)
(backported from commit 2f1e5dc628)

Conflicts:
     hadoop-hdfs-project/hadoop-hdfs/src/site/apt/ExtendedAttributes.apt.vm
     hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm
     hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm
     hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithNFS.apt.vm
     hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithQJM.apt.vm
     hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsDesign.apt.vm
     hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsNfsGateway.apt.vm
     hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HdfsQuotaAdminGuide.apt.vm
2015-02-24 16:18:18 -08:00
Andrew Wang efb7e287f4 HDFS-7763. fix zkfc hung issue due to not catching exception in a corner case. Contributed by Liang Xie.
(cherry picked from commit 7105ebaa9f)
2015-02-24 15:31:18 -08:00
Jing Zhao 8346427929 HDFS-7831. Fix the starting index and end condition of the loop in FileDiffList.findEarlierSnapshotBlocks(). Contributed by Konstantin Shvachko.
(cherry picked from commit 73bcfa99af)
2015-02-24 10:34:42 -08:00
Tsuyoshi Ozawa 280dda5bcd HDFS-7008. xlator should be closed upon exit from DFSAdmin#genericRefresh(). (ozawa)
(cherry picked from commit b53fd7163b)
2015-02-24 23:59:59 +09:00
Colin Patrick Mccabe 453b210d0a HDFS-7805. NameNode recovery prompt should be printed on console (Surendra Singh Lilhore via Colin P. McCabe)
(cherry picked from commit faaddb6ecb)
2015-02-23 19:06:01 -08:00
Colin Patrick Mccabe f4da6f7193 HDFS-7807. libhdfs htable.c: fix htable resizing, add unit test (cmccabe)
(cherry picked from commit 585768667e)
2015-02-23 18:45:44 -08:00
cnauroth 657a6e389b HDFS-7009. Active NN and standby NN have different live nodes. Contributed by Ming Ma.
(cherry picked from commit 769507bd7a)
2015-02-23 15:12:36 -08:00
Arpit Agarwal 83f779e49a HDFS-7806. Refactor: move StorageType from hadoop-hdfs to hadoop-common. (Contributed by Xiaoyu Yao) 2015-02-21 15:48:59 -08:00
yliu eca1588db8 HDFS-7740. Test truncate with DataNodes restarting. (yliu) 2015-02-21 06:33:58 +08:00
cnauroth 9f06fb3aef HDFS-7813. TestDFSHAAdminMiniCluster#testFencer testcase is failing frequently. Contributed by Rakesh R.
(cherry picked from commit 0d6af574e0)
2015-02-20 17:01:22 -08:00
cnauroth e09ba94f28 HDFS-7773. Additional metrics in HDFS to be accessed via jmx. Contributed by Anu Engineer. 2015-02-20 12:38:34 -08:00
cnauroth ad77dfc3e4 HDFS-7814. Fix usage string of storageType parameter for "dfsadmin -setSpaceQuota/clrSpaceQuota". Contributed by Xiaoyu Yao.
(cherry picked from commit 8c6ae0d619)
2015-02-20 12:22:00 -08:00
Kihwal Lee b9157f92fc HDFS-7788. Post-2.6 namenode may not start up with an image containing inodes created with an old release. Contributed by Rushabh Shah.
(cherry picked from commit 7ae5255a16)
2015-02-20 09:09:56 -06:00
Harsh J 5c2c6b00dd HDFS-7752. Improve description for "dfs.namenode.num.extra.edits.retained" and "dfs.namenode.num.checkpoints.retained" properties on hdfs-default.xml. Contributed by Wellington Chevreuil.
(cherry picked from commit b9a17909ba)
2015-02-20 19:21:34 +05:30
yliu fee29e4a4f HDFS-7656. Expose truncate API for HDFS httpfs. (yliu) 2015-02-19 08:38:25 +08:00
Haohui Mai 3605928bd0 HDFS-7808. Remove obsolete -ns options in in DFSHAAdmin.java. Contributed by Arshad Mohammad. 2015-02-18 15:14:53 -08:00
cnauroth b1b1e05e18 HDFS-7772. Document hdfs balancer -exclude/-include option in HDFSCommands.html. Contributed by Xiaoyu Yao. 2015-02-18 12:03:00 -08:00
Akira Ajisaka 6d6c684567 HDFS-7780. Update use of Iterator to Iterable in DataXceiverServer and SnapshotDiffInfo. Contributed by Ray Chiang.
(cherry picked from commit 6dc8812a95)
2015-02-17 14:49:03 -08:00
Haohui Mai f92a4904bf HDFS-6662. WebHDFS cannot open a file if its path contains "%". Contributed by Gerson Carlos. 2015-02-17 13:05:00 -08:00
Kihwal Lee 8b37b4a78b HDFS-7795. Show warning if not all favored nodes were chosen by namenode. Contributed by Kihwal Lee.
(cherry picked from commit db6606223c)
2015-02-17 13:06:41 -06:00
Uma Maheswara Rao G 2cbac36fd3 HDFS-4266. BKJM: Separate write and ack quorum (Rakesh R via umamahesh)
(cherry picked from commit f0412de1c1)
2015-02-17 21:31:43 +05:30
Uma Maheswara Rao G 35fecb5306 HDFS-7797. Add audit log for setQuota operation (Rakesh R via umamahesh)
(cherry picked from commit f24a56787a)
2015-02-17 20:16:34 +05:30
Tsuyoshi Ozawa 00fb0710b6 HADOOP-11600. Fix up source codes to be compiled with Guava 17.0. (ozawa)
(cherry picked from commit 2f0f756b26)
2015-02-17 21:57:58 +09:00
Vinayakumar B 91a5d92916 HDFS-7703. Support favouredNodes for the append for new blocks ( Contributed by Vinayakumar B)
(cherry picked from commit 89a5449280)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-02-17 15:19:03 +05:30
yliu 54e33baaf6 HDFS-7798. Checkpointing failure caused by shared KerberosAuthenticator. (Chengbing Liu via yliu) 2015-02-17 07:50:14 +08:00
cnauroth 441dfa4867 HDFS-7604. Track and display failed DataNode storage locations in NameNode. Contributed by Chris Nauroth.
(cherry picked from commit 9729b244de)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HeartbeatManager.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java
2015-02-16 14:44:49 -08:00
Arpit Agarwal c6aa6cbfe5 HDFS-7775. Use consistent naming for NN-internal quota related types and functions. (Contributed bu Xiaoyu Yao) 2015-02-13 21:01:54 -08:00
cnauroth 751b834ad1 HDFS-7778. Rename FsVolumeListTest to TestFsVolumeList and commit it to branch-2. Contributed by Lei (Eddy) Xu.
(cherry picked from commit 2efb2347a9)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsVolumeList.java
2015-02-13 16:30:53 -08:00
Akira Ajisaka 3ad1d8d533 HDFS-4265. BKJM doesn't take advantage of speculative reads. Contributed by Rakesh R.
(cherry picked from commit 0d521e3326)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-02-13 15:25:13 -08:00
Colin Patrick Mccabe 7b9c978df2 HDFS-7686. Re-add rapid rescan of possibly corrupt block feature to the block scanner (cmccabe)
(cherry picked from commit 8bb9a5000e)
2015-02-13 15:19:04 -08:00
Colin Patrick Mccabe 6edcb9a503 HDFS-7721. The HDFS BlockScanner may run fast during the first hour (cmccabe)
(cherry picked from commit 115428176e)
2015-02-13 15:18:10 -08:00
Colin Patrick Mccabe a54b4a7fc6 HDFS-7430 backport addendum. Add missing change. (cmccabe) 2015-02-13 15:11:14 -08:00
Colin Patrick Mccabe a8c6a96f3b HDFS-7430. Refactor the BlockScanner to use O(1) memory and use multiple threads (cmccabe)
(cherry picked from commit 6e62a1a672)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsDatasetSpi.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsVolumeSpi.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsVolumeListTest.java
2015-02-13 15:04:06 -08:00
Arpit Agarwal f507791554 HDFS-7776. Adding additional unit tests for Quota By Storage Type. (Contributed by Xiaoyu Yao) 2015-02-13 12:02:54 -08:00
Allen Wittenauer 730597c20c HDFS-316. Balancer should run for a configurable # of iterations (Xiaoyu Yao via aw)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm
2015-02-12 18:02:23 -08:00
Colin Patrick Mccabe a9a361c549 HDFS-7790. Do not create optional fields in DFSInputStream unless they are needed (cmccabe)
(cherry picked from commit 871cb56152)
2015-02-12 17:49:11 -08:00
Akira Ajisaka 5696376e29 HDFS-7684. The host:port settings of the deamons should be trimmed before use. Contributed by Anu Engineer.
(cherry picked from commit 9235e2fb4e94a86671e1494f293c973cf572281c)
2015-02-12 17:40:48 -08:00
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 146f559097 Adding missing files from HDFS-7404
(cherry picked from commit 8d7215d40f)
2015-02-12 11:18:41 -06: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
yliu ae316705bb HADOOP-11510. Expose truncate API via FileContext. (yliu) 2015-02-10 01:43:08 +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