Skip to content

HADOOP-18408. ABFS: Setting correct value of requireRenameResilience for nonHNS configuration #4758

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

Merged
merged 10 commits into from
Sep 2, 2022
Merged

HADOOP-18408. ABFS: Setting correct value of requireRenameResilience for nonHNS configuration #4758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cf396e3
ignornig testResilienceAsExpected
sreeb-msft Aug 18, 2022
1060102
HADOOP-18408. Ignoring testResilienceAsExpected for NonHNS Acc
sreeb-msft Aug 18, 2022
aa9db02
Correcting requireRenameResilience to false for nonHNS account
sreeb-msft Aug 19, 2022
2eab301
Fixed extra space in setup()
sreeb-msft Aug 22, 2022
977b455
Nit changes
sreeb-msft Aug 23, 2022
d2fdfaf
Removed extra line
sreeb-msft Aug 23, 2022
aa20579
Removed extra line
sreeb-msft Aug 23, 2022
3e3aaf6
Code style changes
sreeb-msft Aug 24, 2022
f0fd148
Merge branch 'HADOOP-18408' of https://github.com/sreeb-msft/hadoop i…
sreeb-msft Aug 24, 2022
69e8abc
Checking fs capabilities dynamically
sreeb-msft Aug 26, 2022
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
2 changes: 1 addition & 1 deletion ...ava/org/apache/hadoop/mapreduce/lib/output/committer/manifest/TestRenameStageFailure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void setup() throws Exception {
* Does this test suite require rename resilience in the store/FS?
* @return true if the store operations are resilient.
*/
protected boolean requireRenameResilience() {
protected boolean requireRenameResilience() throws IOException {
return false;
}

Expand Down
12 changes: 11 additions & 1 deletion ...hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,17 @@ protected boolean getIsNamespaceEnabled(AzureBlobFileSystem fs)
return fs.getIsNamespaceEnabled(getTestTracingContext(fs, false));
}

public static TracingContext getSampleTracingContext(AzureBlobFileSystem fs,
boolean needsPrimaryReqId) {
String correlationId, fsId;
TracingHeaderFormat format;
correlationId = "test-corr-id";
fsId = "test-filesystem-id";
format = TracingHeaderFormat.ALL_ID_FORMAT;
return new TracingContext(correlationId, fsId,
FSOperationType.TEST_OP, needsPrimaryReqId, format, null);
}

public TracingContext getTestTracingContext(AzureBlobFileSystem fs,
boolean needsPrimaryReqId) {
String correlationId, fsId;
Expand All @@ -167,7 +178,6 @@ public TracingContext getTestTracingContext(AzureBlobFileSystem fs,
FSOperationType.TEST_OP, needsPrimaryReqId, format, null);
}


@Before
public void setup() throws Exception {
//Create filesystem first to make sure getWasbFileSystem() can return an existing filesystem.
Expand Down
13 changes: 10 additions & 3 deletions ...azure/src/test/java/org/apache/hadoop/fs/azurebfs/commit/ITestAbfsRenameStageFailure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
package org.apache.hadoop.fs.azurebfs.commit;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.azurebfs.AbstractAbfsIntegrationTest;
import org.apache.hadoop.fs.azurebfs.AzureBlobFileSystem;
import org.apache.hadoop.fs.azurebfs.contract.ABFSContractTestBinding;
import org.apache.hadoop.fs.azurebfs.contract.AbfsFileSystemContract;
import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AzureBlobFileSystemException;
import org.apache.hadoop.fs.contract.AbstractFSContract;
import org.apache.hadoop.mapreduce.lib.output.committer.manifest.TestRenameStageFailure;

/**
* Rename failure logic on ABFS.
* This will go through the resilient rename operation.
Expand All @@ -41,6 +43,11 @@ public ITestAbfsRenameStageFailure() throws Exception {
binding = new ABFSContractTestBinding();
}

protected boolean isNamespaceEnabled() throws AzureBlobFileSystemException {
AzureBlobFileSystem fs = (AzureBlobFileSystem) getFileSystem();
return fs.getAbfsStore().getIsNamespaceEnabled(AbstractAbfsIntegrationTest.getSampleTracingContext(fs, false));
}

@Override
public void setup() throws Exception {
binding.setup();
Expand All @@ -58,8 +65,8 @@ protected AbstractFSContract createContract(final Configuration conf) {
}

@Override
protected boolean requireRenameResilience() {
return true;
protected boolean requireRenameResilience() throws AzureBlobFileSystemException {
return isNamespaceEnabled();
}

@Override
Expand Down