Skip to content

HADOOP-17990. Fix failing concurrent FS.initialize commands when fs.azure.createRemoteFileSystemDuringInitialization is enabled. #3620

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

Closed
majdyz wants to merge 3 commits into from
Closed

HADOOP-17990. Fix failing concurrent FS.initialize commands when fs.azure.createRemoteFileSystemDuringInitialization is enabled. #3620

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a53b8fe
HADOOP-17990. Fix failing concurrent FS.initialize commands when fs.a…
majdyz Nov 4, 2021
2fa8e9f
Address comments
majdyz Nov 8, 2021
0926477
Fix style error
majdyz Nov 10, 2021
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
32 changes: 25 additions & 7 deletions ...p-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,7 @@ public void initialize(URI uri, Configuration configuration)
if (abfsConfiguration.getCreateRemoteFileSystemDuringInitialization()) {
TracingContext tracingContext = new TracingContext(clientCorrelationId,
fileSystemId, FSOperationType.CREATE_FILESYSTEM, tracingHeaderFormat, listener);
if (this.tryGetFileStatus(new Path(AbfsHttpConstants.ROOT_PATH), tracingContext) == null) {
try {
this.createFileSystem(tracingContext);
} catch (AzureBlobFileSystemException ex) {
checkException(null, ex, AzureServiceErrorCode.FILE_SYSTEM_ALREADY_EXISTS);
}
}
this.createFileSystemIfNotExist(tracingContext);
}

LOG.trace("Initiate check for delegation token manager");
Expand Down Expand Up @@ -1411,6 +1405,30 @@ AzureBlobFileSystemStore getAbfsStore() {
return abfsStore;
}

@VisibleForTesting
void setAbfsStore(AzureBlobFileSystemStore abfsStore) {
this.abfsStore = abfsStore;
}

@VisibleForTesting
void createFileSystemIfNotExist(TracingContext tracingContext) throws IOException {
if (this.tryGetFileStatus(new Path(AbfsHttpConstants.ROOT_PATH), tracingContext) == null) {
try {
this.createFileSystem(tracingContext);
} catch (AzureBlobFileSystemException ex) {
checkException(null, (AzureBlobFileSystemException) ex,
AzureServiceErrorCode.FILE_SYSTEM_ALREADY_EXISTS);
} catch (IOException ex) {
if (ex.getCause() instanceof AzureBlobFileSystemException) {
checkException(null, (AzureBlobFileSystemException) ex.getCause(),
AzureServiceErrorCode.FILE_SYSTEM_ALREADY_EXISTS);
} else {
throw ex;
}
}
}
}

@VisibleForTesting
AbfsClient getAbfsClient() {
return abfsStore.getClient();
Expand Down
44 changes: 44 additions & 0 deletions ...re/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemInitAndCreate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,16 @@
package org.apache.hadoop.fs.azurebfs;

import java.io.FileNotFoundException;
import java.io.IOException;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsRestOperationException;
import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AzureBlobFileSystemException;
import org.apache.hadoop.fs.azurebfs.contracts.services.AzureServiceErrorCode;
import org.apache.hadoop.fs.azurebfs.utils.TracingContext;
import org.junit.Test;

import org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys;
Expand Down Expand Up @@ -49,4 +56,41 @@ public void ensureFilesystemWillNotBeCreatedIfCreationConfigIsNotSet() throws Ex
final AzureBlobFileSystem fs = this.createFileSystem();
FileStatus[] fileStatuses = fs.listStatus(new Path("/"));
}

@Test
public void ensureFilesystemWillBeCreatedIfCreationConfigIsSet() throws Exception {
try (AzureBlobFileSystem fs = createFileSystem()) {
Configuration config = getRawConfiguration();
fs.initialize(FileSystem.getDefaultUri(config), config);

// Make sure createFileSystemIfNotExists is working as intended.
final MockAzureBlobFileSystemStore store = new MockAzureBlobFileSystemStore(config);
fs.setAbfsStore(store);
fs.createFileSystemIfNotExist(getTestTracingContext(fs, true));
assertTrue("Expected AzureBlobFileSystemStore.createFilesystem to be called",
store.isCreateFileSystemCalled);
}
}

/**
* Mock AzureBlobFileSystemStore to simulate container already exists
* exception when calling createFileSystem command.
*/
static class MockAzureBlobFileSystemStore extends AzureBlobFileSystemStore {
boolean isCreateFileSystemCalled = false;

public MockAzureBlobFileSystemStore(Configuration config) throws IOException {
super(FileSystem.getDefaultUri(config), true, config, null);
}

@Override
public void createFilesystem(TracingContext tracingContext) throws AzureBlobFileSystemException {
isCreateFileSystemCalled = true;
// Make sure createFileSystemIfNotExists works when the filesystem/container already exists.
throw new AbfsRestOperationException(
AzureServiceErrorCode.FILE_SYSTEM_ALREADY_EXISTS.getStatusCode(),
AzureServiceErrorCode.FILE_SYSTEM_ALREADY_EXISTS.getErrorCode(),
"This container is already exists", null);
}
}
}