Browse Source

HADOOP-14349. Rename ADLS CONTRACT_ENABLE_KEY. Contributed by Mingliang Liu

Mingliang Liu 8 years ago
parent
commit
e4c32bccde

+ 2 - 2
hadoop-tools/hadoop-azure-datalake/src/site/markdown/index.md

@@ -253,7 +253,7 @@ Add the following properties to `core-site.xml`
 ```
 ## Testing the azure-datalake-store Module
 The `hadoop-azure` module includes a full suite of unit tests.
-Most of the tests will run without additional configuration by running mvn test.
+Most of the tests will run without additional configuration by running `mvn test`.
 This includes tests against mocked storage, which is an in-memory emulation of Azure Data Lake Storage.
 
 A selection of tests can run against the Azure Data Lake Storage. To run these
@@ -262,7 +262,7 @@ information mentioned in the above sections and the following properties.
 
 ```xml
 <property>
-    <name>dfs.adl.test.contract.enable</name>
+    <name>fs.adl.test.contract.enable</name>
     <value>true</value>
 </property>
 

+ 7 - 1
hadoop-tools/hadoop-azure-datalake/src/test/java/org/apache/hadoop/fs/adl/live/AdlStorageConfiguration.java

@@ -35,7 +35,7 @@ public final class AdlStorageConfiguration {
   static final String CONTRACT_XML = "adls.xml";
 
   private static final String CONTRACT_ENABLE_KEY =
-      "dfs.adl.test.contract.enable";
+      "fs.adl.test.contract.enable";
   private static final boolean CONTRACT_ENABLE_DEFAULT = false;
 
   private static final String FILE_SYSTEM_KEY =
@@ -49,6 +49,12 @@ public final class AdlStorageConfiguration {
   private static boolean isContractTestEnabled = false;
   private static Configuration conf = null;
 
+  static {
+    Configuration.addDeprecation("dfs.adl.test.contract.enable",
+        CONTRACT_ENABLE_KEY);
+    Configuration.reloadExistingConfigurations();
+  }
+
   private AdlStorageConfiguration() {
   }