Skip to content

HDFS-17724: Set recover.lease.on.close.exception as an instance member in the DfsClientConf.java #7348

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
wants to merge 2 commits into from
Closed

HDFS-17724: Set recover.lease.on.close.exception as an instance member in the DfsClientConf.java #7348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a701f7c
HDFS-17724: Set recover.lease.on.close.exception as an instance membe…
Feb 4, 2025
12e1f6c
Fix build failures
Feb 4, 2025
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
7 changes: 1 addition & 6 deletions ...oject/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;

import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.Write.RECOVER_LEASE_ON_CLOSE_EXCEPTION_DEFAULT;
import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.Write.RECOVER_LEASE_ON_CLOSE_EXCEPTION_KEY;

/**
* This class supports writing files in striped layout and erasure coded format.
* Each stripe contains a sequence of cells.
Expand Down Expand Up @@ -1200,9 +1197,7 @@ void setClosed() {

@Override
protected synchronized void closeImpl() throws IOException {
boolean recoverLeaseOnCloseException = dfsClient.getConfiguration()
.getBoolean(RECOVER_LEASE_ON_CLOSE_EXCEPTION_KEY,
RECOVER_LEASE_ON_CLOSE_EXCEPTION_DEFAULT);
boolean recoverLeaseOnCloseException = dfsClient.getConf().getRecoverLeaseOnCloseException();
try {
if (isClosed()) {
exceptionLastSeen.check(true);
Expand Down
10 changes: 10 additions & 0 deletions ...ct/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ public class DfsClientConf {

private final boolean deadNodeDetectionEnabled;
private final long leaseHardLimitPeriod;
private final boolean recoverLeaseOnCloseException;

public DfsClientConf(Configuration conf) {
// The hdfsTimeout is currently the same as the ipc timeout
Expand Down Expand Up @@ -315,6 +316,11 @@ public DfsClientConf(Configuration conf) {
HdfsClientConfigKeys.DFS_CLIENT_PIPELINE_RECOVERY_MAX_RETRIES,
HdfsClientConfigKeys.DFS_CLIENT_PIPELINE_RECOVERY_MAX_RETRIES_DEFAULT
);

recoverLeaseOnCloseException = conf.getBoolean(
Write.RECOVER_LEASE_ON_CLOSE_EXCEPTION_KEY,
Write.RECOVER_LEASE_ON_CLOSE_EXCEPTION_DEFAULT
);
}

private ByteArrayManager.Conf loadWriteByteArrayManagerConf(
Expand Down Expand Up @@ -745,6 +751,10 @@ public int getMaxPipelineRecoveryRetries() {
return maxPipelineRecoveryRetries;
}

public boolean getRecoverLeaseOnCloseException() {
return recoverLeaseOnCloseException;
}

/**
* Configuration for short-circuit reads.
*/
Expand Down