Skip to content

ABFS: fix NPE in getCaseInsensitiveEnum when fs.azure.fns.account.service.type is configured #17

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

Open
neeraj-kulkarni wants to merge 3 commits into
base: branch-3.5.0-dremio
Choose a base branch
from
Open

ABFS: fix NPE in getCaseInsensitiveEnum when fs.azure.fns.account.service.type is configured #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d06ea8d
ABFS: fix NPE in getCaseInsensitiveEnum when defaultValue is null
neeraj-kulkarni Jul 30, 2026
f1f64f0
Added code to appropriately handle HNS without posix
neeraj-kulkarni Aug 6, 2026
386db9e
fixed build issue
neeraj-kulkarni Aug 6, 2026
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
10 changes: 9 additions & 1 deletion hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ public class AbfsConfiguration{
DefaultValue = DEFAULT_FS_AZURE_ACCOUNT_IS_HNS_ENABLED)
private String isNamespaceEnabledAccount;

@BooleanConfigurationValidatorAnnotation(ConfigurationKey = FS_AZURE_ACCOUNT_IS_POSIX_ACL_SUPPORTED,
DefaultValue = true)
private boolean isPosixAclSupported;

@BooleanConfigurationValidatorAnnotation(ConfigurationKey = FS_AZURE_ENABLE_DFSTOBLOB_FALLBACK,
DefaultValue = DEFAULT_FS_AZURE_ENABLE_DFSTOBLOB_FALLBACK)
private boolean isDfsToBlobFallbackEnabled;
Expand Down Expand Up @@ -742,7 +746,7 @@ public AbfsServiceType getFsConfiguredServiceTypeFromUrl() {
* @return the service type.
*/
public AbfsServiceType getConfiguredServiceTypeForFNSAccounts() {
return getCaseInsensitiveEnum(FS_AZURE_FNS_ACCOUNT_SERVICE_TYPE, null);
return getCaseInsensitiveEnum(FS_AZURE_FNS_ACCOUNT_SERVICE_TYPE, getFsConfiguredServiceType());
}

/**
Expand All @@ -763,6 +767,10 @@ public boolean isDfsToBlobFallbackEnabled() {
return isDfsToBlobFallbackEnabled;
}

public boolean isPosixAclSupported() {
return isPosixAclSupported;
}

/**
* Checks if the service type configured is valid for account type used.
* HNS Enabled accounts cannot have service type as BLOB.
Expand Down
8 changes: 4 additions & 4 deletions ...ls/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ public OutputStream createFile(final Path path,
if (triggerConditionalCreateOverwrite) {
op = conditionalCreateOverwriteFile(relativePath,
statistics,
new Permissions(isNamespaceEnabled, permission, umask),
new Permissions(isNamespaceEnabled && abfsConfiguration.isPosixAclSupported(), permission, umask),
isAppendBlob,
contextEncryptionAdapter,
tracingContext
Expand All @@ -719,7 +719,7 @@ public OutputStream createFile(final Path path,
} else {
op = createClient.createPath(relativePath, true,
overwrite,
new Permissions(isNamespaceEnabled, permission, umask),
new Permissions(isNamespaceEnabled && abfsConfiguration.isPosixAclSupported(), permission, umask),
isAppendBlob,
null,
contextEncryptionAdapter,
Expand Down Expand Up @@ -852,8 +852,8 @@ public void createDirectory(final Path path, final FsPermission permission,

boolean overwrite =
!isNamespaceEnabled || abfsConfiguration.isEnabledMkdirOverwrite();
Permissions permissions = new Permissions(isNamespaceEnabled,
permission, umask);
Permissions permissions = new Permissions(
isNamespaceEnabled && abfsConfiguration.isPosixAclSupported(), permission, umask);
final AbfsRestOperation op = createClient.createPath(getRelativePath(path),
false, overwrite, permissions, false, null, null, tracingContext);
perfInfo.registerResult(op.getResult()).registerSuccess(true);
Expand Down
8 changes: 8 additions & 0 deletions ...hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/constants/ConfigurationKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ public final class ConfigurationKeys {
*/
public static final String FS_AZURE_ACCOUNT_IS_HNS_ENABLED = "fs.azure.account.hns.enabled";

/**
* Config to indicate whether the account supports POSIX ACLs (x-ms-permissions, x-ms-umask).
* Defaults to true. Set to false for HNS accounts that have POSIX ACL support disabled —
* suppresses POSIX headers without changing the service endpoint routing.
*/
public static final String FS_AZURE_ACCOUNT_IS_POSIX_ACL_SUPPORTED =
"fs.azure.account.posix.acls.supported";

/**
* Config to specify which {@link AbfsServiceType} to use with HNS-Disabled Account type.
* Default value will be identified from URL used to initialize filesystem.
Expand Down