Skip to content

HDFS-15408. Add a new parameter to control the timeout properties of Connection in case that the command ‘hdfs fsck’ would failed with SocketTimeoutException. #2068

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 1 commit into from
Closed

HDFS-15408. Add a new parameter to control the timeout properties of Connection in case that the command ‘hdfs fsck’ would failed with SocketTimeoutException. #2068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,9 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
public static final boolean DFS_PROTECTED_SUBDIRECTORIES_ENABLE_DEFAULT =
false;

public static final String DFS_FSCK_HTTP_TIMEOUT_KEY = "dfs.fsck.http.timeout.ms";
public static final String DFS_FSCK_HTTP_TIMEOUT_KEY_DEFAULT = 60000;

// dfs.client.retry confs are moved to HdfsClientConfigKeys.Retry
@Deprecated
public static final String DFS_CLIENT_RETRY_POLICY_ENABLED_KEY
Expand Down
13 changes: 12 additions & 1 deletion hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,22 @@ public DFSck(Configuration conf, PrintStream out) throws IOException {
super(conf);
this.ugi = UserGroupInformation.getCurrentUser();
this.out = out;
int httpTimeOut = getHttpTimeOut(conf);
this.connectionFactory = URLConnectionFactory
.newDefaultURLConnectionFactory(conf);
.newDefaultURLConnectionFactory(httpTimeOut, httpTimeOut, conf);
this.isSpnegoEnabled = UserGroupInformation.isSecurityEnabled();
}

/**
* try to get httpTimeOut parameter from conf
*/
private int getHttpTimeOut(Configuration conf) {
int httpTimeOut = conf.getInt(
DFSConfigKeys.DFS_FSCK_HTTP_TIMEOUT_KEY,
DFSConfigKeys.DFS_FSCK_HTTP_TIMEOUT_KEY_DEFAULT);
return httpTimeOut <= 0 ? DFSConfigKeys.DFS_FSCK_HTTP_TIMEOUT_KEY_DEFAULT : httpTimeOut;
}

/**
* Print fsck usage information
*/
Expand Down