From 6b3c9db10f36a17bed32fcb58d548e385f0ee0ee Mon Sep 17 00:00:00 2001 From: sneha Date: Thu, 20 May 2021 16:34:49 +0530 Subject: [PATCH 1/2] Setting appendblob enabled to false for NonHNS combination --- .../hadoop-azure/dev-support/testrun-scripts/runtests.sh | 6 ++++-- .../src/test/resources/azure-auth-keys.xml.template | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) 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 d3d40621accc7..ff0d95df0321c 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 @@ -40,8 +41,9 @@ values=("{account name}.dfs.core.windows.net" "true" "SharedKey") generateconfigs combination=NonHNS-SharedKey -properties=("fs.azure.abfs.account.name" "fs.azure.test.namespace.enabled" "fs.azure.account.auth.type") -values=("{account name}.dfs.core.windows.net" "false" "SharedKey") +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" "false" "SharedKey" "false") generateconfigs 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 2e6e2750c3b78..12dbbfab47970 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. From 0dfa5f384b394b00cff161b72e4cb3ae71982896 Mon Sep 17 00:00:00 2001 From: sneha Date: Fri, 21 May 2021 17:01:39 +0530 Subject: [PATCH 2/2] Incorporating the comments --- .../dev-support/testrun-scripts/runtests.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 ff0d95df0321c..25d9593d573eb 100755 --- a/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh +++ b/hadoop-tools/hadoop-azure/dev-support/testrun-scripts/runtests.sh @@ -35,15 +35,20 @@ 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") generateconfigs combination=NonHNS-SharedKey -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" "false" "SharedKey" "false") +properties=("fs.azure.abfs.account.name" "fs.azure.test.namespace.enabled" "fs.azure.account.auth.type") +values=("{account name}.dfs.core.windows.net" "false" "SharedKey") generateconfigs