From 4c039fafebfe7b4d68b60c5ec6075d889ab1c40b Mon Sep 17 00:00:00 2001 From: snehavarma Date: Wed, 9 Jun 2021 10:54:10 +0530 Subject: [PATCH] HADOOP-17715 ABFS: Append blob tests with non HNS accounts fail (#3028) --- .../hadoop-azure/dev-support/testrun-scripts/runtests.sh | 7 +++++++ .../src/test/resources/azure-auth-keys.xml.template | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh b/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh index d3d40621acc..25d9593d573 100755 --- a/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh +++ b/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh @@ -26,6 +26,7 @@ set -eo pipefail begin ### ADD THE TEST COMBINATIONS BELOW. DO NOT EDIT THE ABOVE LINES. +### THE SCRIPT REQUIRES THE FOLLOWING UTILITIES xmlstarlet AND pcregrep. combination=HNS-OAuth @@ -34,6 +35,12 @@ properties=("fs.azure.abfs.account.name" "fs.azure.test.namespace.enabled" values=("{account name}.dfs.core.windows.net" "true" "OAuth") generateconfigs +combination=AppendBlob-HNS-OAuth +properties=("fs.azure.abfs.account.name" "fs.azure.test.namespace.enabled" +"fs.azure.account.auth.type" "fs.azure.test.appendblob.enabled") +values=("{account name}.dfs.core.windows.net" "true" "OAuth" "true") +generateconfigs + combination=HNS-SharedKey properties=("fs.azure.abfs.account.name" "fs.azure.test.namespace.enabled" "fs.azure.account.auth.type") values=("{account name}.dfs.core.windows.net" "true" "SharedKey") diff --git a/hadoop-tools/hadoop-azure/src/test/resources/azure-auth-keys.xml.template b/hadoop-tools/hadoop-azure/src/test/resources/azure-auth-keys.xml.template index 2e6e2750c3b..12dbbfab479 100644 --- a/hadoop-tools/hadoop-azure/src/test/resources/azure-auth-keys.xml.template +++ b/hadoop-tools/hadoop-azure/src/test/resources/azure-auth-keys.xml.template @@ -167,7 +167,8 @@ create the test FS instance. false If made true, tests will be running under the assumption that append blob is enabled and the root directory and contract test root - directory will be part of the append blob directories. + directory will be part of the append blob directories. Should be false for + non-HNS accounts.