This is an automated email from the ASF dual-hosted git repository.
steveloughran pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new c1c433a3a31 HADOOP-19909. ABFS: Improve error messages on auth setup
failures (#8531)
c1c433a3a31 is described below
commit c1c433a3a31ccd5f5d8dd288123f3df7e25aafff
Author: Steve Loughran <[email protected]>
AuthorDate: Thu Jun 4 09:52:48 2026 +0100
HADOOP-19909. ABFS: Improve error messages on auth setup failures (#8531)
Explain why a key is invalid and print the relevant option name/account.
Contributed by Steve Loughran
---
.../main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java | 2 +-
.../apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java | 2 +-
.../hadoop/fs/azurebfs/services/ShellDecryptionKeyProvider.java | 2 +-
.../org/apache/hadoop/fs/azurebfs/services/SimpleKeyProvider.java | 6 ++----
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java
index 6c95bd37689..1cb4e74d48d 100644
---
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java
+++
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java
@@ -1061,7 +1061,7 @@ public String getStorageAccountKey() throws
AzureBlobFileSystemException {
Class<?> clazz = rawConfig.getClassByName(keyProviderClass);
keyProviderObject = clazz.newInstance();
} catch (Exception e) {
- throw new KeyProviderException("Unable to load key provider class.",
e);
+ throw new KeyProviderException("Unable to load key provider class " +
keyProviderClass, e);
}
if (!(keyProviderObject instanceof KeyProvider)) {
throw new KeyProviderException(keyProviderClass
diff --git
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java
index 1a2614dcc1d..61d82dda528 100644
---
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java
+++
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/FixedSASTokenProvider.java
@@ -36,7 +36,7 @@ public FixedSASTokenProvider(final String fixedSASToken)
throws SASTokenProvider
this.fixedSASToken = fixedSASToken;
if (fixedSASToken == null || fixedSASToken.isEmpty()) {
throw new SASTokenProviderException(
- String.format("Configured Fixed SAS Token is Invalid: %s",
fixedSASToken));
+ "Configured Fixed SAS Token is empty or null.");
}
}
diff --git
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/ShellDecryptionKeyProvider.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/ShellDecryptionKeyProvider.java
index bdac922fb3a..33778b64c8d 100644
---
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/ShellDecryptionKeyProvider.java
+++
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/ShellDecryptionKeyProvider.java
@@ -45,7 +45,7 @@ public String getStorageAccountKey(String accountName,
Configuration rawConfig)
try {
abfsConfig = new AbfsConfiguration(rawConfig, accountName);
} catch(IllegalAccessException | IOException e) {
- throw new KeyProviderException("Unable to get key from credential
providers.", e);
+ throw new KeyProviderException("Unable to get key from credential
provider for account " + accountName, e);
}
final String command =
abfsConfig.get(ConfigurationKeys.AZURE_KEY_ACCOUNT_SHELLKEYPROVIDER_SCRIPT);
diff --git
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/SimpleKeyProvider.java
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/SimpleKeyProvider.java
index e3adc59afac..89460841625 100644
---
a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/SimpleKeyProvider.java
+++
b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/SimpleKeyProvider.java
@@ -48,12 +48,10 @@ public String getStorageAccountKey(String accountName,
Configuration rawConfig)
// Validating the key.
validateStorageAccountKey(key);
} catch (IllegalAccessException | InvalidConfigurationValueException e) {
- LOG.debug("Failure to retrieve storage account key for {}", accountName,
- e);
+ LOG.debug("Failure to retrieve storage account key for {}", accountName,
e);
throw new KeyProviderException("Failure to initialize configuration for "
+ accountName
- + " key =\"" + key + "\""
- + ": " + e, e);
+ + ". Invalid base64 value in " +
ConfigurationKeys.FS_AZURE_ACCOUNT_KEY_PROPERTY_NAME, e);
} catch(IOException ioe) {
LOG.warn("Unable to get key for {} from credential providers. {}",
accountName, ioe, ioe);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
