big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-15968. ABFS: add try catch for UGI failure when initializing ABFS.

Browse Source 
Contributed by Da Zhou.
This commit is contained in:
Da Zhou 2018-12-04 13:39:10 +00:00 committed by Steve Loughran
parent de4255509a
commit a8bbd818d5
No known key found for this signature in database
GPG Key ID: D22CF846DBB162A0
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
View File

@ -121,7 +121,12 @@ public void initialize(URI uri, Configuration configuration)
} }
if (!abfsConfiguration.getSkipUserGroupMetadataDuringInitialization()) { if (!abfsConfiguration.getSkipUserGroupMetadataDuringInitialization()) {
this.primaryUserGroup = userGroupInformation.getPrimaryGroupName(); try {
this.primaryUserGroup = userGroupInformation.getPrimaryGroupName();
} catch (IOException ex) {
LOG.error("Failed to get primary group for {}, using user name as primary group name", user);
this.primaryUserGroup = this.user;
}
} else { } else {
//Provide a default group name //Provide a default group name
this.primaryUserGroup = this.user; this.primaryUserGroup = this.user;

13
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
View File

@ -102,8 +102,8 @@ public class AzureBlobFileSystemStore {
private AbfsClient client; private AbfsClient client;
private URI uri; private URI uri;
private final UserGroupInformation userGroupInformation; private final UserGroupInformation userGroupInformation;
private final String userName; private String userName;
private final String primaryUserGroup; private String primaryUserGroup;
private static final String DATE_TIME_PATTERN = "E, dd MMM yyyy HH:mm:ss 'GMT'"; private static final String DATE_TIME_PATTERN = "E, dd MMM yyyy HH:mm:ss 'GMT'";
private static final String XMS_PROPERTIES_ENCODING = "ISO-8859-1"; private static final String XMS_PROPERTIES_ENCODING = "ISO-8859-1";
private static final int LIST_MAX_RESULTS = 5000; private static final int LIST_MAX_RESULTS = 5000;
@ -134,10 +134,15 @@ public AzureBlobFileSystemStore(URI uri, boolean isSecureScheme, Configuration c
this.userName = userGroupInformation.getShortUserName(); this.userName = userGroupInformation.getShortUserName();
if (!abfsConfiguration.getSkipUserGroupMetadataDuringInitialization()) { if (!abfsConfiguration.getSkipUserGroupMetadataDuringInitialization()) {
primaryUserGroup = userGroupInformation.getPrimaryGroupName(); try {
this.primaryUserGroup = userGroupInformation.getPrimaryGroupName();
} catch (IOException ex) {
LOG.error("Failed to get primary group for {}, using user name as primary group name", userName);
this.primaryUserGroup = userName;
}
} else { } else {
//Provide a default group name //Provide a default group name
primaryUserGroup = userName; this.primaryUserGroup = userName;
} }
this.azureAtomicRenameDirSet = new HashSet<>(Arrays.asList( this.azureAtomicRenameDirSet = new HashSet<>(Arrays.asList(