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

2539 Commits

Author SHA1 Message Date
Tao Luo 6d2f80107f HDFS-7263. Snapshot read can reveal future bytes for appended files. Contributed by Tao Luo. 
(cherry picked from commit 8bfef59029)

(cherry picked from commit 3827a1acdbc4f9fec3179dcafa614734b5fa31bc)
 2015-08-27 17:53:06 -07:00
Colin Patrick Mccabe d3a7769bff HDFS-7235. DataNode#transferBlock should report blocks that don't exist using reportBadBlock (yzhang via cmccabe) 
(cherry picked from commit ac9ab037e9)

(cherry picked from commit 842a54a5f6)
(cherry picked from commit 1aa9e34c5106c496ffd390f6b2c822d387fb1908)
 2015-08-27 17:47:39 -07:00
Ming Ma dda8e0e328 HDFS-7314. When the DFSClient lease cannot be renewed, abort open-for-write files rather than the entire DFSClient. (mingma) 
(cherry picked from commit fbd88f1062)
(cherry picked from commit 516bbf1c20)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java

(cherry picked from commit fb1bf424bdad20fff7ab390ce75c4bec558e7e6d)
 2015-08-27 17:38:06 -07:00
Arpit Agarwal aa2303088f HDFS-8486. DN startup may cause severe data loss. (Contributed by Daryn Sharp) 2015-08-06 15:17:45 -07:00
Akira Ajisaka 0daf9dd552 Revert "Merge r1588258 from trunk, HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus Json schema" 
This reverts commit 641cbc0feb.
 2015-04-16 16:40:31 -05:00
Arpit Agarwal ef212fbe7e HDFS-7733. NFS: readdir/readdirplus return null directory attribute on failure. (Contributed by Arpit Agarwal) 2015-02-04 16:26:00 -08:00
Tsz-Wo Nicholas Sze 4f5d330623 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

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 2015-01-21 11:54:26 -08:00
Colin Patrick Mccabe 51d49ffffd 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)
(cherry picked from commit bcaf15e2fa)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
 2014-12-19 13:25:33 -08:00
arp 91042c950f HDFS-7503. Namenode restart after large deletions can cause slow processReport (Arpit Agarwal) 2014-12-10 23:38:55 -08:00
Colin Patrick Mccabe d93bfbace4 HDFS-7489. Incorrect locking in FsVolumeList#checkDirs can hang datanodes (Noah Lorang via Colin P. McCabe) 
(cherry picked from commit d8352b9b2b)
(cherry picked from commit a037d6030b)
 2014-12-09 10:59:49 -08:00
Colin Patrick Mccabe 575d7bd5b0 HDFS-4882. Prevent the Namenode's LeaseManager from looping forever in checkLeases (Ravi Prakash via Colin P. McCabe) 
(cherry picked from commit daacbc18d7)
 2014-11-24 11:42:46 -08:00
cnauroth 2379932968 HDFS-7425. NameNode block deletion logging uses incorrect appender. Contributed by Chris Nauroth. 
(cherry picked from commit b8c094b075)
(cherry picked from commit 8d8eb8dcec)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-21 16:58:06 -08:00
Karthik Kambatla 5913c5143b Update release date for 2.5.2 
(cherry picked from commit 1e9a3f42ff)
 2014-11-21 14:35:06 -08:00
Arun C. Murthy 98a4538cf4 Preparing to release hadoop-2.6.0-rc1. 
(cherry picked from commit 9ff7315cbe)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt
	hadoop-yarn-project/CHANGES.txt
 2014-11-13 13:05:50 -08:00
cnauroth ed2a4db6d4 HDFS-7385. ThreadLocal used in FSEditLog class causes FSImage permission mess up. Contributed by jiangyu. 
(cherry picked from commit b0a41de68c)
(cherry picked from commit 4e9001530f)
 2014-11-13 12:37:48 -08:00
Haohui Mai 59b2a74ea9 Fix CHANGES.txt to keep it consistent with trunk. 2014-11-12 20:13:38 -08:00
Arun C. Murthy 797e62defa HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-12 19:00:50 -08:00
Arun C. Murthy 42849e5077 HDFS-7387. Merging to branch-2.6 for hadoop-2.6.0-rc1. 
(cherry picked from commit 09f36b1688)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-12 11:51:11 -08:00
Brandon Li d0ca88c5a1 HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write. Contributed by Brandon Li 
(cherry picked from commit 99d9d0c2d1)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java

(cherry picked from commit 0c3b7887e6)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-12 11:50:04 -08:00
Karthik Kambatla ba01844260 Set the release date for 2.5.2 
(cherry picked from commit 68a0508728)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit 92de44c2c5)
 2014-11-10 15:24:14 -08:00
Arun C. Murthy 60584c732f Preparing to release hadoop-2.6.0: Set version in branch-2.6 to 2.6.1-SNAPSHOT. 2014-11-09 19:21:11 -08:00
Arun C. Murthy be31db82f7 Updated CHANGES.txt to reflect hadoop-2.6.0 release dates. 
(cherry picked from commit 770cc14442)
 2014-11-09 18:53:55 -08:00
Suresh Srinivas c98fcd1d3b HDFS-7383. DataNode.requestShortCircuitFdsForRead may throw NullPointerException. Contributed by Tsz Wo Nicholas Sze. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-09 18:18:58 -08:00
Arun C. Murthy 85531834b3 HADOOP-11286. Copied LimitInputStream from guava-0.14 to hadoop to avoid issues with newer versions of guava in applications. Contributed by Christopher Tubbs. 
(cherry picked from commit 6caa8100d5)
 2014-11-09 05:25:01 -08:00
cnauroth 539ef7fc13 HDFS-7382. DataNode in secure mode may throw NullPointerException if client connects before DataNode registers itself with NameNode. Contributed by Chris Nauroth. 
(cherry picked from commit 9ba8d8c7eb)
(cherry picked from commit 98b81c6624)
 2014-11-08 22:31:22 -08:00
Haohui Mai 9fe9ee1c16 HDFS-7379. TestBalancer#testBalancerWithRamDisk creates test files incorrectly. Contributed by Xiaoyu Yao. 2014-11-07 13:39:33 -08:00
Jing Zhao 92337e1dce HDFS-7228. Fix TestDNFencing.testQueueingWithAppend. Contributed by Yongjun Zhang. 
(cherry picked from commit 75a9c894b3)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-06 23:12:08 -08:00
Andrew Wang a2b46a7340 HDFS-7221. TestDNFencingWithReplication fails consistently. Contributed by Charles Lamb. 
(cherry picked from commit ac56b0637e)
(cherry picked from commit 2d0996ae6d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-11-06 22:49:28 -08:00
Jing Zhao a9b0436132 HDFS-7364. Balancer always shows zero Bytes Already Moved. Contributed by Tsz Wo Nicholas Sze. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
 2014-11-06 17:56:15 -08:00
Haohui Mai 83ed42fa6b HDFS-7367. HDFS short-circuit read cannot negotiate shared memory slot and file descriptors when SASL is enabled on DataTransferProtocol. Contributed by Chris Nauroth. 2014-11-05 20:34:25 -08:00
cnauroth e041de4492 HDFS-7359. NameNode in secured HA cluster fails to start if dfs.namenode.secondary.http-address cannot be interpreted as a network address. Contributed by Chris Nauroth. 
(cherry picked from commit ba1d4ad25b)
(cherry picked from commit f172a08238)
 2014-11-05 15:29:40 -08:00
Colin Patrick Mccabe 8702cc2360 HDFS-7199. DFSOutputStream should not silently drop data if DataStreamer crashes with an unchecked exception (rushabhs via cmccabe) 
(cherry picked from commit 56257fab1d)
(cherry picked from commit 6f7ce842c0)
 2014-11-05 10:54:56 -08:00
yliu 3faabf2052 HDFS-7218. FSNamesystem ACL operations should write to audit log on failure. (clamb via yliu) 2014-11-05 15:55:56 +08:00
Karthik Kambatla d76756dfe1 Adding release 2.5.2 to CHANGES.txt 
(cherry picked from commit 4de56d27fb)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
 2014-11-04 16:52:56 -08:00
Karthik Kambatla c7b3356bfb HADOOP-11260. Patch up Jetty to disable SSLv3. (Mike Yoder via kasha) 
(cherry picked from commit dbf30e3c0e)
 2014-11-04 16:24:09 -08:00
Jing Zhao 1ca1a0358e HDFS-7233. NN logs unnecessary org.apache.hadoop.hdfs.protocol.UnresolvedPathException. Contributed by Rushabh S Shah. 2014-11-04 16:05:39 -08:00
Haohui Mai 0fde606e3f HDFS-7355. TestDataNodeVolumeFailure#testUnderReplicationAfterVolFailure fails on Windows, because we cannot deny access to the file owner. Contributed by Chris Nauroth. 2014-11-04 15:19:18 -08:00
Haohui Mai 1b54fa6e27 HDFS-7334. Fix periodic failures of TestCheckpoint#testTooManyEditReplayFailures. Contributed by Charles Lamb. 2014-11-04 14:35:22 -08:00
Jing Zhao f354b0fe88 HDFS-7340. Make rollingUpgrade start/finalize idempotent. Contributed by Jing Zhao. 2014-11-04 10:17:55 -08:00
cnauroth ff361e7c31 HDFS-7328. TestTraceAdmin assumes Unix line endings. Contributed by Chris Nauroth. 
(cherry picked from commit 2bb327eb93)
(cherry picked from commit 5720cc9d2d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java
 2014-11-03 20:09:58 -08:00
Haohui Mai e94a044d18 HDFS-7147. Update archival storage user documentation. Contributed by Tsz Wo Nicholas Sze. 2014-11-03 15:13:19 -08:00
Tsz-Wo Nicholas Sze a4dca48676 HDFS-7276. Limit the number of byte arrays used by DFSOutputStream and provide a mechanism for recycling arrays. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
 2014-11-01 11:29:23 -07:00
Ravi Prakash b7296ee84f HDFS-7309. XMLUtils.mangleXmlString doesn't seem to handle less than sign. (Colin Patrick McCabe via raviprak) 
(cherry picked from commit c7f81dad30)
 2014-10-31 11:24:38 -07:00
cnauroth d3dd1ac1c2 HDFS-7313. Support optional configuration of AES cipher suite on DataTransferProtocol. Contributed by Chris Nauroth. 
(cherry picked from commit 5573b3476a)
(cherry picked from commit 57fa43ab0a)
 2014-10-30 22:55:45 -07:00
cnauroth 3283268d8b HDFS-6385. Show when block deletion will start after NameNode startup in WebUI. Contributed by Chris Nauroth. 
(cherry picked from commit c637d6d9d5)
(cherry picked from commit caded2545c)
 2014-10-30 22:31:26 -07:00
Haohui Mai 4e419b6ede HADOOP-11247. Fix a couple javac warnings in NFS. Contributed by Brandon Li. 
(cherry picked from commit c7d1db7495)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-10-30 12:08:50 -07:00
Jing Zhao b2a7bbf4f6 HDFS-7230. Add rolling downgrade documentation. Contributed by Tsz Wo Nicholas Sze. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-30 10:49:30 -07:00
Jing Zhao c8dfc9126a HDFS-7305. NPE seen in wbhdfs FS while running SLive. Contributed by Jing Zhao. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
 2014-10-29 16:28:50 -07:00
Kihwal Lee 1354ec1c74 HDFS-7300. The getMaxNodesPerRack() method in 
BlockPlacementPolicyDefault is flawed. contributed by Kihwal Lee
(cherry picked from commit 3ae84e1ba8)
 2014-10-29 17:25:51 -05:00
Jason Lowe ba86f06cf7 HADOOP-9740. Fix FsShell '-text' command to be able to read Avro files stored in HDFS and other filesystems. Contributed by Allan Yan 
(cherry picked from commit 0c15130db2)
 2014-10-29 20:25:25 +00:00
Colin Patrick Mccabe 5a0285fa9a HDFS-7287. The OfflineImageViewer (OIV) can output invalid XML depending on the filename (Ravi Prakash via Colin P. McCabe) 
(cherry picked from commit d33e07dc49)
(cherry picked from commit 112d694086)
 2014-10-29 12:40:18 -07:00
Brandon Li 19ec4212d6 HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for better maintenance. Contributed by Yongjun Zhang 
(cherry picked from commit 72a556d3b0)
(cherry picked from commit 6caf36f9eb)
 2014-10-29 11:10:10 -07:00
Karthik Kambatla c0b17bf104 HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha) 
(cherry picked from commit 3f48493bed)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-28 17:38:38 -07:00
cnauroth 905b339a3f HDFS-7291. Persist in-memory replicas with appropriate unbuffered copy API on POSIX and Windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit c6f04f391b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit c2790932bd)
 2014-10-28 14:18:24 -07:00
yliu 9465da32e8 HDFS-6606. Optimize HDFS Encrypted Transport performance. (yliu) 2014-10-28 21:19:26 +08:00
yliu fe4da80c76 HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu) 2014-10-28 14:47:11 +08:00
Vinayakumar B 3e4e6e3da7 HDFS-6995. Block should be placed in the client's 'rack-local' node if 'client-local' node is not available (vinayakumarb) 
Adding missed test file

(cherry picked from commit cba1f9e389)
(cherry picked from commit fea721daf9)
 2014-10-28 10:06:06 +05:30
Vinayakumar B 043364ffa8 HDFS-6995. Block should be placed in the client's 'rack-local' node if 'client-local' node is not available (vinayakumarb) 
(cherry picked from commit ed841dd9a9)
(cherry picked from commit 5f58886770)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-28 10:04:56 +05:30
cnauroth c03cca7e23 HDFS-7128. Decommission slows way down when it gets towards the end. Contributed by Ming Ma. 
(cherry picked from commit 80cb472620f0a7889e311ca32212a42b95c6794e)
(cherry picked from commit 7e949744b1)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
 2014-10-27 16:41:55 -07:00
cnauroth a9f31af29c HDFS-6934. Move checksum computation off the hot path when writing to RAM disk. Contributed by Chris Nauroth. 
(cherry picked from commit 463aec1171)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java

(cherry picked from commit 3d67da502a)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocal.java
 2014-10-27 12:01:47 -07:00
Jing Zhao 6724c2f7e4 HDFS-7296. HdfsConstants#MEMORY_STORAGE_POLICY_ID and HdfsConstants#MEMORY_STORAGE_POLICY_ID are missing in branch-2. Contributed by Jing Zhao. 2014-10-27 11:21:48 -07:00
Colin Patrick Mccabe 62f23d0b7d HDFS-6988. Improve HDFS-6581 eviction configuration (Xiaoyu Yao via Colin P. McCabe) 
(cherry picked from commit a52eb4bc5f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
(cherry picked from commit 2bcda17ee7)
 2014-10-24 13:22:26 -07:00
Jitendra Pandey abb28fbb46 HDFS-6904. Added files missing in previous commit. 2014-10-24 11:59:55 -07:00
Jitendra Pandey 327db15362 HDFS-6904. YARN unable to renew delegation token fetched via webhdfs due to incorrect service port. 2014-10-24 11:44:22 -07:00
yliu 82ac5c901e HDFS-7243. HDFS concat operation should not be allowed in Encryption Zone. (clamb via yliu) 2014-10-24 11:35:13 +08:00
Brandon Li e1baa3a503 HDFS-7180. NFSv3 gateway frequently gets stuck due to GC. Contributed by Brandon Li 
(cherry picked from commit d71d40a63d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit d27cd5ad77)
 2014-10-22 21:35:09 -07:00
Colin Patrick Mccabe 1ec2dbf093 HDFS-7154. Fix returning value of starting reconfiguration task (Lei Xu via Colin P. McCabe) 
(cherry picked from commit 7aab5fa1bd)
(cherry picked from commit 8c3b007236)
 2014-10-21 15:42:39 -07:00
Brandon Li 20108263fb HDFS-7215.Add JvmPauseMonitor to NFS gateway. Contributed by Brandon Li 
(cherry picked from commit 4e134a02a4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

(cherry picked from commit c800e058ea)
 2014-10-21 11:56:26 -07:00
Brandon Li 3fa1ee2923 HDFS-7259. Unresponseive NFS mount point due to deferred COMMIT response. Contributed by Brandon Li 
(cherry picked from commit 33e020cb19)
 2014-10-21 11:05:50 -07:00
Tsz-Wo Nicholas Sze 0ee6ddb782 HDFS-7260. Change DFSOutputStream.MAX_PACKETS to be configurable. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
 2014-10-17 18:34:23 -07:00
arp 9183dadb73 HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsLocatedFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 2014-10-17 16:00:53 -07:00
cnauroth 2e98379bcb HDFS-7090. Use unbuffered writes when persisting in-memory replicas. Contributed by Xiaoyu Yao. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-17 16:00:53 -07:00
cnauroth 1b6d115ccf HDFS-7112. LazyWriter should use either async IO or one thread per physical disk. Contributed by Xiaoyu Yao. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-10-17 16:00:53 -07:00
arp 137f0b8cbf HDFS-7171. Fix Jenkins failures in HDFS-6581 branch. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java
 2014-10-17 16:00:53 -07:00
arp e6457a0e08 HDFS-7129. Metrics to track usage of memory for writes. (Contributed by Xiaoyu Yao) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:53 -07:00
arp d61daff9bf HDFS-7159. Use block storage policy to set lazy persist preference. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.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/FSImageFormat.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FSImageFormatPBSnapshot.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 2014-10-17 16:00:52 -07:00
arp ba31a9503c HDFS-7144. Fix findbugs warnings in RamDiskReplicaTracker. (Contributed by Tsz Wo Nicholas Sze) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:52 -07:00
arp 3481f5d4f3 HDFS-7155. Bugfix in createLocatedFileStatus caused by bad merge. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:52 -07:00
arp 05cfd68863 HDFS-7143. Fix findbugs warnings in HDFS-6581 branch. (Contributed by Tsz Wo Nicholas Sze) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:52 -07:00
arp 9de4d1897a HDFS-6932. Balancer and Mover tools should ignore replicas on RAM_DISK. (Contributed by Xiaoyu Yao) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/StorageType.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestStorageMover.java
 2014-10-17 16:00:52 -07:00
arp a59ce50627 HDFS-6990. Add unit test for evict/delete RAM_DISK block with open handle. (Contributed by Xiaoyu Yao) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:52 -07:00
arp e9eebaa012 HDFS-7100. Make eviction scheme pluggable. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2014-10-17 16:00:52 -07:00
arp 144198892f HDFS-7108. Fix unit test failures in SimulatedFsDataset. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:51 -07:00
arp ebdbb5ec24 HDFS-7091. Add forwarding constructor for INodeFile for existing callers. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageSerialization.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
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSPermissionChecker.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeFile.java
 2014-10-17 16:00:51 -07:00
arp d32ce5794a HDFS-7084. FsDatasetImpl#copyBlockFiles debug log can be improved. (Contributed by Xiaoyu Yao) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:51 -07:00
arp b7062e8d3e HDFS-7080. Fix finalize and upgrade unit test failures. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:51 -07:00
arp d3ccbd8e65 HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Contributed by Xiaoyu Yao) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:51 -07:00
arp 6cc206b8ad HDFS-6978. Directory scanner should correctly reconcile blocks on RAM disk. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:51 -07:00
arp 2fdd9f51ce HDFS-7066. LazyWriter#evictBlocks misses a null check for replicaState. (Contributed by Xiaoyu Yao) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:50 -07:00
arp bcec6582cf HDFS-6991. Notify NN of evicted block before deleting it from RAM disk. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
 2014-10-17 16:00:50 -07:00
arp 186d195033 HDFS-6977. Delete all copies when a block is deleted from the block space. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:50 -07:00
arp 34f28eaff9 HDFS-6930. Improve replica eviction from RAM disk. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:50 -07:00
arp 4609ba0dc8 HDFS-6950. Add Additional unit tests for HDFS-6581. (Contributed by Xiaoyu Yao) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
 2014-10-17 16:00:50 -07:00
arp 754ba3a42d HDFS-6931. Move lazily persisted replicas to finalized directory on DN startup. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2014-10-17 16:00:50 -07:00
arp d973656e5d HDFS-6960. Bugfix in LazyWriter, fix test case and some refactoring. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:50 -07:00
arp 2079d4b72e HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:49 -07:00
arp 15372df48d HDFS-6929. NN periodically unlinks lazy persist files with missing replicas from namespace. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:49 -07:00
arp c2721edc50 HDFS-6927. Initial unit tests for Lazy Persist files. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
 2014-10-17 16:00:49 -07:00
arp 8e01a89b61 HDFS-6926. DN support for saving replicas to persistent storage and evicting in-memory replicas. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2014-10-17 16:00:49 -07:00
arp 34d0088bf9 HDFS-6925. DataNode should attempt to place replicas on transient storage first if lazyPersist flag is received. (Arpit Agarwal) 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsVolumeSpi.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
 2014-10-17 16:00:49 -07:00