This is an automated email from the ASF dual-hosted git repository. iwasakims pushed a commit to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push: new dc9c3ce HADOOP-16104. Wasb tests to downgrade to skip when test a/c is namespace enabled. Contributed by Masatake Iwasaki. dc9c3ce is described below commit dc9c3ce30b9e043ef8e6c0d4d2faa185ffdefb4f Author: Masatake Iwasaki <iwasak...@apache.org> AuthorDate: Wed Feb 20 22:00:57 2019 +0900 HADOOP-16104. Wasb tests to downgrade to skip when test a/c is namespace enabled. Contributed by Masatake Iwasaki. (cherry picked from commit aa3ad3660506382884324c4b8997973f5a68e29a) --- .../org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java | 3 +++ .../hadoop/fs/azure/contract/NativeAzureFileSystemContract.java | 1 + .../org/apache/hadoop/fs/azure/integration/AzureTestUtils.java | 9 +++++++++ hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml | 5 +++++ hadoop-tools/hadoop-azure/src/test/resources/wasb.xml | 7 ++++++- 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java index b65ce78..816a3af 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java @@ -32,6 +32,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.azure.integration.AzureTestConstants; import org.apache.hadoop.fs.azure.metrics.AzureFileSystemInstrumentation; import org.apache.hadoop.fs.azure.metrics.AzureFileSystemMetricsSystem; +import org.apache.hadoop.fs.azure.integration.AzureTestUtils; import org.apache.hadoop.metrics2.AbstractMetric; import org.apache.hadoop.metrics2.MetricsRecord; import org.apache.hadoop.metrics2.MetricsSink; @@ -529,6 +530,8 @@ public final class AzureBlobStorageTestAccount implements AutoCloseable, static CloudStorageAccount createTestAccount(Configuration conf) throws URISyntaxException, KeyProviderException { + AzureTestUtils.assumeNamespaceDisabled(conf); + String testAccountName = verifyWasbAccountNameInConfig(conf); if (testAccountName == null) { LOG.warn("Skipping live Azure test because of missing test account"); diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/contract/NativeAzureFileSystemContract.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/contract/NativeAzureFileSystemContract.java index a264aca..ea90a86 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/contract/NativeAzureFileSystemContract.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/contract/NativeAzureFileSystemContract.java @@ -34,6 +34,7 @@ public class NativeAzureFileSystemContract extends AbstractBondedFSContract { public NativeAzureFileSystemContract(Configuration conf) { super(conf); //insert the base features addConfResource(CONTRACT_XML); + AzureTestUtils.assumeNamespaceDisabled(conf); } @Override diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/integration/AzureTestUtils.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/integration/AzureTestUtils.java index c46320a..bc19700 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/integration/AzureTestUtils.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/integration/AzureTestUtils.java @@ -47,6 +47,7 @@ import static org.junit.Assume.assumeTrue; import static org.apache.hadoop.fs.azure.AzureBlobStorageTestAccount.WASB_ACCOUNT_NAME_DOMAIN_SUFFIX_REGEX; import static org.apache.hadoop.fs.azure.AzureBlobStorageTestAccount.WASB_TEST_ACCOUNT_NAME_WITH_DOMAIN; import static org.apache.hadoop.fs.azure.integration.AzureTestConstants.*; +import static org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys.FS_AZURE_TEST_NAMESPACE_ENABLED_ACCOUNT; import static org.apache.hadoop.test.MetricsAsserts.getLongCounter; import static org.apache.hadoop.test.MetricsAsserts.getLongGauge; import static org.apache.hadoop.test.MetricsAsserts.getMetrics; @@ -545,4 +546,12 @@ public final class AzureTestUtils extends Assert { inputStream.close(); return new String(buffer, 0, count); } + + /** + * Assume hierarchical namespace is disabled for test account. + */ + public static void assumeNamespaceDisabled(Configuration conf) { + Assume.assumeFalse("Hierarchical namespace is enabled for test account.", + conf.getBoolean(FS_AZURE_TEST_NAMESPACE_ENABLED_ACCOUNT, false)); + } } diff --git a/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml b/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml index a36a391..24d444a 100644 --- a/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml +++ b/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml @@ -28,6 +28,11 @@ <value>false</value> </property> + <property> + <name>fs.azure.test.namespace.enabled</name> + <value>false</value> + </property> + <!--==================== ABFS CONFIGURATION ====================--> <!-- SEE relevant section in "site/markdown/testing_azure.md"--> diff --git a/hadoop-tools/hadoop-azure/src/test/resources/wasb.xml b/hadoop-tools/hadoop-azure/src/test/resources/wasb.xml index 5aaca26..d7cd1a5 100644 --- a/hadoop-tools/hadoop-azure/src/test/resources/wasb.xml +++ b/hadoop-tools/hadoop-azure/src/test/resources/wasb.xml @@ -161,4 +161,9 @@ <value>true</value> </property> -</configuration> \ No newline at end of file + <property> + <name>fs.azure.test.namespace.enabled</name> + <value>false</value> + </property> + +</configuration> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org