Author: jing9
Date: Wed Feb 5 22:48:06 2014
New Revision: 1564973
URL: http://svn.apache.org/r1564973
Log:
HDFS-5873. dfs.http.policy should have higher precedence over dfs.https.enable.
Contributed by Haohui Mai.
Added:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHttpPolicy.java
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeHttpServer.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1564973&r1=1564972&r2=1564973&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Feb 5
22:48:06 2014
@@ -872,6 +872,9 @@ Release 2.3.0 - UNRELEASED
HDFS-5876. SecureDataNodeStarter does not pick up configuration in
hdfs-site.xml. (Haohui Mai via jing9)
+ HDFS-5873. dfs.http.policy should have higher precedence over
dfs.https.enable.
+ (Haohui Mai via jing9)
+
BREAKDOWN OF HDFS-2832 SUBTASKS AND RELATED JIRAS
HDFS-4985. Add storage type to the protocol and expose it in block report
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java?rev=1564973&r1=1564972&r2=1564973&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
Wed Feb 5 22:48:06 2014
@@ -1567,31 +1567,34 @@ public class DFSUtil {
* configuration settings.
*/
public static HttpConfig.Policy getHttpPolicy(Configuration conf) {
- String httpPolicy = conf.get(DFSConfigKeys.DFS_HTTP_POLICY_KEY,
- DFSConfigKeys.DFS_HTTP_POLICY_DEFAULT);
-
- HttpConfig.Policy policy = HttpConfig.Policy.fromString(httpPolicy);
-
- if (policy == HttpConfig.Policy.HTTP_ONLY) {
- boolean httpsEnabled = conf.getBoolean(
- DFSConfigKeys.DFS_HTTPS_ENABLE_KEY,
+ String policyStr = conf.get(DFSConfigKeys.DFS_HTTP_POLICY_KEY);
+ if (policyStr == null) {
+ boolean https = conf.getBoolean(DFSConfigKeys.DFS_HTTPS_ENABLE_KEY,
DFSConfigKeys.DFS_HTTPS_ENABLE_DEFAULT);
- boolean hadoopSslEnabled = conf.getBoolean(
+ boolean hadoopSsl = conf.getBoolean(
CommonConfigurationKeys.HADOOP_SSL_ENABLED_KEY,
CommonConfigurationKeys.HADOOP_SSL_ENABLED_DEFAULT);
- if (hadoopSslEnabled) {
+ if (hadoopSsl) {
LOG.warn(CommonConfigurationKeys.HADOOP_SSL_ENABLED_KEY
- + " is deprecated. Please use "
- + DFSConfigKeys.DFS_HTTPS_ENABLE_KEY + ".");
- policy = HttpConfig.Policy.HTTPS_ONLY;
- } else if (httpsEnabled) {
+ + " is deprecated. Please use " + DFSConfigKeys.DFS_HTTP_POLICY_KEY
+ + ".");
+ }
+ if (https) {
LOG.warn(DFSConfigKeys.DFS_HTTPS_ENABLE_KEY
- + " is deprecated. Please use "
- + DFSConfigKeys.DFS_HTTPS_ENABLE_KEY + ".");
- policy = HttpConfig.Policy.HTTP_AND_HTTPS;
+ + " is deprecated. Please use " + DFSConfigKeys.DFS_HTTP_POLICY_KEY
+ + ".");
}
+
+ return (hadoopSsl || https) ? HttpConfig.Policy.HTTP_AND_HTTPS
+ : HttpConfig.Policy.HTTP_ONLY;
+ }
+
+ HttpConfig.Policy policy = HttpConfig.Policy.fromString(policyStr);
+ if (policy == null) {
+ throw new HadoopIllegalArgumentException("Unregonized value '"
+ + policyStr + "' for " + DFSConfigKeys.DFS_HTTP_POLICY_KEY);
}
conf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, policy.name());
Added:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHttpPolicy.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHttpPolicy.java?rev=1564973&view=auto
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHttpPolicy.java
(added)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHttpPolicy.java
Wed Feb 5 22:48:06 2014
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdfs;
+
+import static org.apache.hadoop.http.HttpConfig.Policy.HTTP_AND_HTTPS;
+import static org.apache.hadoop.http.HttpConfig.Policy.HTTP_ONLY;
+
+import org.apache.hadoop.HadoopIllegalArgumentException;
+import org.apache.hadoop.conf.Configuration;
+import org.junit.Assert;
+import org.junit.Test;
+
+public final class TestHttpPolicy {
+
+ @Test(expected = HadoopIllegalArgumentException.class)
+ public void testInvalidPolicyValue() {
+ Configuration conf = new Configuration();
+ conf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, "invalid");
+ DFSUtil.getHttpPolicy(conf);
+ }
+
+ @Test
+ public void testDeprecatedConfiguration() {
+ Configuration conf = new Configuration(false);
+ Assert.assertSame(HTTP_ONLY, DFSUtil.getHttpPolicy(conf));
+
+ conf.setBoolean(DFSConfigKeys.DFS_HTTPS_ENABLE_KEY, true);
+ Assert.assertSame(HTTP_AND_HTTPS, DFSUtil.getHttpPolicy(conf));
+
+ conf = new Configuration(false);
+ conf.setBoolean(DFSConfigKeys.HADOOP_SSL_ENABLED_KEY, true);
+ Assert.assertSame(HTTP_AND_HTTPS, DFSUtil.getHttpPolicy(conf));
+
+ conf = new Configuration(false);
+ conf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, HTTP_ONLY.name());
+ conf.setBoolean(DFSConfigKeys.DFS_HTTPS_ENABLE_KEY, true);
+ Assert.assertSame(HTTP_ONLY, DFSUtil.getHttpPolicy(conf));
+ }
+}
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeHttpServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeHttpServer.java?rev=1564973&r1=1564972&r2=1564973&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeHttpServer.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeHttpServer.java
Wed Feb 5 22:48:06 2014
@@ -104,7 +104,9 @@ public class TestNameNodeHttpServer {
server.getHttpsAddress() == null));
} finally {
- server.stop();
+ if (server != null) {
+ server.stop();
+ }
}
}
