Skip to content

HADOOP-16104. Wasb tests to downgrade to skip when test a/c is namesp… #4137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

HADOOP-16104. Wasb tests to downgrade to skip when test a/c is namesp… #4137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ls/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/AzureBlobStorageTestAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
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;
Expand Down Expand Up @@ -525,6 +526,8 @@ public static CloudStorageAccount createTestAccount()

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");
Expand Down
1 change: 1 addition & 0 deletions ...zure/src/test/java/org/apache/hadoop/fs/azure/contract/NativeAzureFileSystemContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions ...ols/hadoop-azure/src/test/java/org/apache/hadoop/fs/azure/integration/AzureTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
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;
Expand Down Expand Up @@ -545,4 +546,12 @@ public static String readStringFromStream(FSDataInputStream inputStream) throws
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));
}
}
5 changes: 5 additions & 0 deletions hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"-->

Expand Down
7 changes: 6 additions & 1 deletion hadoop-tools/hadoop-azure/src/test/resources/wasb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,9 @@
<value>true</value>
</property>

</configuration>
<property>
<name>fs.azure.test.namespace.enabled</name>
<value>false</value>
</property>

</configuration>