From 385dcc40642005351c09b306a4c55556f49bcfe3 Mon Sep 17 00:00:00 2001 From: cnauroth Date: Sat, 7 Nov 2015 07:39:45 -0800 Subject: [PATCH] HDFS-9394. branch-2 hadoop-hdfs-client fails during FileSystem ServiceLoader initialization, because HftpFileSystem is missing. Contributed by Mingliang Liu. (cherry picked from commit 1ee2db5c41d2e608eb3102d0e13e132448c5ed8f) --- .../main/java/org/apache/hadoop/hdfs/web/HftpFileSystem.java | 0 .../main/java/org/apache/hadoop/hdfs/web/HsftpFileSystem.java | 0 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++ 3 files changed, 4 insertions(+) rename hadoop-hdfs-project/{hadoop-hdfs => hadoop-hdfs-client}/src/main/java/org/apache/hadoop/hdfs/web/HftpFileSystem.java (100%) rename hadoop-hdfs-project/{hadoop-hdfs => hadoop-hdfs-client}/src/main/java/org/apache/hadoop/hdfs/web/HsftpFileSystem.java (100%) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/HftpFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/HftpFileSystem.java similarity index 100% rename from hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/HftpFileSystem.java rename to hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/HftpFileSystem.java diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/HsftpFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/HsftpFileSystem.java similarity index 100% rename from hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/HsftpFileSystem.java rename to hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/HsftpFileSystem.java diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 207d4506082..779c925c7b2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1421,6 +1421,10 @@ Release 2.8.0 - UNRELEASED HDFS-9384. TestWebHdfsContentLength intermittently hangs and fails due to TCP conversation mismatch between client and server. (cnauroth) + HDFS-9394. branch-2 hadoop-hdfs-client fails during FileSystem ServiceLoader + initialization, because HftpFileSystem is missing. + (Mingliang Liu via cnauroth) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES