HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)
(cherry picked from commit 3f48493bed22f9618a9330deaaaa070734989814)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f2679ae2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f2679ae2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f2679ae2
Branch: refs/heads/branch-2
Commit: f2679ae22ebc3af49702602dfdc9ed5abe7ab051
Parents: 0aec884
Author: Karthik Kambatla <ka...@apache.org>
Authored: Tue Oct 28 17:21:20 2014 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Tue Oct 28 17:33:52 2014 -0700
----------------------------------------------------------------------
.../src/main/tomcat/ssl-server.xml | 2 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 110 +++++++++++++++++++
2 files changed, 111 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2679ae2/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
----------------------------------------------------------------------
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
index eac6ee2..614b702 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
@@ -70,7 +70,7 @@
described in the APR documentation -->
<Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS"
+ clientAuth="false" sslEnabledProtocols="TLSv1"
keystoreFile="${httpfs.ssl.keystore.file}"
keystorePass="${httpfs.ssl.keystore.pass}"/>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2679ae2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 27f47fc..d3d39ca 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1056,6 +1056,116 @@ Release 2.6.0 - UNRELEASED
HDFS-7154. Fix returning value of starting reconfiguration task (Lei Xu via
Colin P. McCabe)
+ BREAKDOWN OF HDFS-6581 SUBTASKS AND RELATED JIRAS
+
+ HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)
+
+ HDFS-6924. Add new RAM_DISK storage type. (Arpit Agarwal)
+
+ HDFS-6922. Add LazyPersist flag to INodeFile, save it in FsImage and
+ edit logs. (Arpit Agarwal)
+
+ HDFS-6923. Propagate LazyPersist flag to DNs via DataTransferProtocol.
+ (Arpit Agarwal)
+
+ HDFS-6925. DataNode should attempt to place replicas on transient storage
+ first if lazyPersist flag is received. (Arpit Agarwal)
+
+ HDFS-6926. DN support for saving replicas to persistent storage and
+ evicting in-memory replicas. (Arpit Agarwal)
+
+ HDFS-6927. Initial unit tests for lazy persist files. (Arpit Agarwal)
+
+ HDFS-6929. NN periodically unlinks lazy persist files with missing
+ replicas from namespace. (Arpit Agarwal)
+
+ HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing.
+ (Arpit Agarwal)
+
+ HDFS-6960. Bugfix in LazyWriter, fix test case and some refactoring.
+ (Arpit Agarwal)
+
+ HDFS-6931. Move lazily persisted replicas to finalized directory on DN
+ startup. (Arpit Agarwal)
+
+ HDFS-6950. Add Additional unit tests for HDFS-6581. (Xiaoyu Yao via
+ Arpit Agarwal)
+
+ HDFS-6930. Improve replica eviction from RAM disk. (Arpit Agarwal)
+
+ HDFS-6977. Delete all copies when a block is deleted from the block space.
+ (Arpit Agarwal)
+
+ HDFS-6991. Notify NN of evicted block before deleting it from RAM disk.
+ (Arpit Agarwal)
+
+ HDFS-6978. Directory scanner should correctly reconcile blocks on RAM
+ disk. (Arpit Agarwal)
+
+ HDFS-7066. LazyWriter#evictBlocks misses a null check for replicaState.
+ (Xiaoyu Yao via Arpit Agarwal)
+
+ HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Xiaoyu Yao via
+ Arpit Agarwal)
+
+ HDFS-6581. Few more unit test fixes for HDFS-6581. (Arpit Agarwal)
+
+ HDFS-7080. Fix finalize and upgrade unit test failures. (Arpit Agarwal)
+
+ HDFS-7084. FsDatasetImpl#copyBlockFiles debug log can be improved.
+ (Xiaoyu Yao via Arpit Agarwal)
+
+ HDFS-7091. Add forwarding constructor for INodeFile for existing callers.
+ (Arpit Agarwal)
+
+ HDFS-7100. Make eviction scheme pluggable. (Arpit Agarwal)
+
+ HDFS-7108. Fix unit test failures in SimulatedFsDataset. (Arpit Agarwal)
+
+ HDFS-7071. Updated editsStored and editsStored.xml to bump layout
+ version and add LazyPersist flag. (Xiaoyu Yao and Arpit Agarwal via
+ Arpit Agarwal)
+
+ HDFS-6990. Add unit test for evict/delete RAM_DISK block with open
+ handle. (Xiaoyu Yao via Arpit Agarwal)
+
+ HDFS-7143. Fix findbugs warnings in HDFS-6581 branch. (szetszwo via
+ Arpit Agarwal)
+
+ HDFS-6932. Balancer and Mover tools should ignore replicas on RAM_DISK.
+ (Xiaoyu Yao via Arpit Agarwal)
+
+ HDFS-7144. Fix findbugs warnings in RamDiskReplicaTracker. (szetszwo via
+ Arpit Agarwal)
+
+ HDFS-7155. Bugfix in createLocatedFileStatus caused by bad merge.
+ (Arpit Agarwal)
+
+ HDFS-7153. Add storagePolicy to NN edit log during file creation.
+ (Arpit Agarwal)
+
+ HDFS-7159. Use block storage policy to set lazy persist preference.
+ (Arpit Agarwal)
+
+ HDFS-7129. Metrics to track usage of memory for writes. (Xiaoyu Yao
+ via Arpit Agarwal)
+
+ HDFS-7171. Fix Jenkins failures in HDFS-6581 branch. (Arpit Agarwal)
+
+ HDFS-7112. LazyWriter should use either async IO or one thread per physical
+ disk. (Xiaoyu Yao via cnauroth)
+
+ HDFS-7090. Use unbuffered writes when persisting in-memory replicas.
+ (Xiaoyu Yao via cnauroth)
+
+ HDFS-6934. Move checksum computation off the hot path when writing to RAM
+ disk. (cnauroth)
+
+ HDFS-7291. Persist in-memory replicas with appropriate unbuffered copy API
+ on POSIX and Windows. (Xiaoyu Yao via cnauroth)
+
+ HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha)
+
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
