HDFS-11335. Remove HdfsClientConfigKeys.DFS_CLIENT_SLOW_IO_WARNING_THRESHOLD_KEY usage from DNConf. (Manoj Govindassamy via lei)
This commit is contained in:
parent
3e06475307
commit
bec9b7aa1d
|
@ -1294,14 +1294,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
|
||||||
public static final int DEFAULT_DFSCLIENT_HEDGED_READ_THREADPOOL_SIZE
|
public static final int DEFAULT_DFSCLIENT_HEDGED_READ_THREADPOOL_SIZE
|
||||||
= HdfsClientConfigKeys.HedgedRead.THREADPOOL_SIZE_DEFAULT;
|
= HdfsClientConfigKeys.HedgedRead.THREADPOOL_SIZE_DEFAULT;
|
||||||
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static final String DFS_CLIENT_WRITE_PACKET_SIZE_KEY =
|
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_KEY;
|
|
||||||
@Deprecated
|
|
||||||
public static final int DFS_CLIENT_WRITE_PACKET_SIZE_DEFAULT =
|
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_DEFAULT;
|
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static final String DFS_CLIENT_SOCKET_TIMEOUT_KEY =
|
public static final String DFS_CLIENT_SOCKET_TIMEOUT_KEY =
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY;
|
HdfsClientConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY;
|
||||||
|
@ -1395,13 +1387,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_TEST_DROP_NAMENODE_RESPONSE_NUM_DEFAULT;
|
HdfsClientConfigKeys.DFS_CLIENT_TEST_DROP_NAMENODE_RESPONSE_NUM_DEFAULT;
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static final String DFS_CLIENT_SLOW_IO_WARNING_THRESHOLD_KEY =
|
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_SLOW_IO_WARNING_THRESHOLD_KEY;
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static final long DFS_CLIENT_SLOW_IO_WARNING_THRESHOLD_DEFAULT =
|
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_SLOW_IO_WARNING_THRESHOLD_DEFAULT;
|
|
||||||
@Deprecated
|
|
||||||
public static final String DFS_CLIENT_KEY_PROVIDER_CACHE_EXPIRY_MS =
|
public static final String DFS_CLIENT_KEY_PROVIDER_CACHE_EXPIRY_MS =
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_KEY_PROVIDER_CACHE_EXPIRY_MS;
|
HdfsClientConfigKeys.DFS_CLIENT_KEY_PROVIDER_CACHE_EXPIRY_MS;
|
||||||
@Deprecated
|
@Deprecated
|
||||||
|
|
|
@ -163,7 +163,8 @@ class BlockReceiver implements Closeable {
|
||||||
this.isDatanode = clientname.length() == 0;
|
this.isDatanode = clientname.length() == 0;
|
||||||
this.isClient = !this.isDatanode;
|
this.isClient = !this.isDatanode;
|
||||||
this.restartBudget = datanode.getDnConf().restartReplicaExpiry;
|
this.restartBudget = datanode.getDnConf().restartReplicaExpiry;
|
||||||
this.datanodeSlowLogThresholdMs = datanode.getDnConf().datanodeSlowIoWarningThresholdMs;
|
this.datanodeSlowLogThresholdMs =
|
||||||
|
datanode.getDnConf().getSlowIoWarningThresholdMs();
|
||||||
// For replaceBlock() calls response should be sent to avoid socketTimeout
|
// For replaceBlock() calls response should be sent to avoid socketTimeout
|
||||||
// at clients. So sending with the interval of 0.5 * socketTimeout
|
// at clients. So sending with the interval of 0.5 * socketTimeout
|
||||||
final long readTimeout = datanode.getDnConf().socketTimeout;
|
final long readTimeout = datanode.getDnConf().socketTimeout;
|
||||||
|
|
|
@ -33,8 +33,6 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_NON_LOCAL_LAZY_P
|
||||||
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_SLOW_PEERS_REPORT_INTERVAL_DEFAULT;
|
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_SLOW_PEERS_REPORT_INTERVAL_DEFAULT;
|
||||||
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_SLOW_PEERS_REPORT_INTERVAL_KEY;
|
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_SLOW_PEERS_REPORT_INTERVAL_KEY;
|
||||||
import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY;
|
import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY;
|
||||||
import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_DEFAULT;
|
|
||||||
import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_KEY;
|
|
||||||
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_MAX_LOCKED_MEMORY_DEFAULT;
|
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_MAX_LOCKED_MEMORY_DEFAULT;
|
||||||
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_MAX_LOCKED_MEMORY_KEY;
|
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_MAX_LOCKED_MEMORY_KEY;
|
||||||
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_SOCKET_WRITE_TIMEOUT_KEY;
|
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DATANODE_SOCKET_WRITE_TIMEOUT_KEY;
|
||||||
|
@ -101,10 +99,8 @@ public class DNConf {
|
||||||
final long ibrInterval;
|
final long ibrInterval;
|
||||||
final long initialBlockReportDelayMs;
|
final long initialBlockReportDelayMs;
|
||||||
final long cacheReportInterval;
|
final long cacheReportInterval;
|
||||||
final long dfsclientSlowIoWarningThresholdMs;
|
|
||||||
final long datanodeSlowIoWarningThresholdMs;
|
final long datanodeSlowIoWarningThresholdMs;
|
||||||
final int writePacketSize;
|
|
||||||
|
|
||||||
final String minimumNameNodeVersion;
|
final String minimumNameNodeVersion;
|
||||||
final String encryptionAlgorithm;
|
final String encryptionAlgorithm;
|
||||||
final SaslPropertiesResolver saslPropsResolver;
|
final SaslPropertiesResolver saslPropsResolver;
|
||||||
|
@ -151,9 +147,6 @@ public class DNConf {
|
||||||
DFS_DATANODE_TRANSFERTO_ALLOWED_KEY,
|
DFS_DATANODE_TRANSFERTO_ALLOWED_KEY,
|
||||||
DFS_DATANODE_TRANSFERTO_ALLOWED_DEFAULT);
|
DFS_DATANODE_TRANSFERTO_ALLOWED_DEFAULT);
|
||||||
|
|
||||||
writePacketSize = getConf().getInt(DFS_CLIENT_WRITE_PACKET_SIZE_KEY,
|
|
||||||
DFS_CLIENT_WRITE_PACKET_SIZE_DEFAULT);
|
|
||||||
|
|
||||||
readaheadLength = getConf().getLong(
|
readaheadLength = getConf().getLong(
|
||||||
HdfsClientConfigKeys.DFS_DATANODE_READAHEAD_BYTES_KEY,
|
HdfsClientConfigKeys.DFS_DATANODE_READAHEAD_BYTES_KEY,
|
||||||
HdfsClientConfigKeys.DFS_DATANODE_READAHEAD_BYTES_DEFAULT);
|
HdfsClientConfigKeys.DFS_DATANODE_READAHEAD_BYTES_DEFAULT);
|
||||||
|
@ -194,9 +187,6 @@ public class DNConf {
|
||||||
DFS_CACHEREPORT_INTERVAL_MSEC_KEY,
|
DFS_CACHEREPORT_INTERVAL_MSEC_KEY,
|
||||||
DFS_CACHEREPORT_INTERVAL_MSEC_DEFAULT);
|
DFS_CACHEREPORT_INTERVAL_MSEC_DEFAULT);
|
||||||
|
|
||||||
this.dfsclientSlowIoWarningThresholdMs = getConf().getLong(
|
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_SLOW_IO_WARNING_THRESHOLD_KEY,
|
|
||||||
HdfsClientConfigKeys.DFS_CLIENT_SLOW_IO_WARNING_THRESHOLD_DEFAULT);
|
|
||||||
this.datanodeSlowIoWarningThresholdMs = getConf().getLong(
|
this.datanodeSlowIoWarningThresholdMs = getConf().getLong(
|
||||||
DFSConfigKeys.DFS_DATANODE_SLOW_IO_WARNING_THRESHOLD_KEY,
|
DFSConfigKeys.DFS_DATANODE_SLOW_IO_WARNING_THRESHOLD_KEY,
|
||||||
DFSConfigKeys.DFS_DATANODE_SLOW_IO_WARNING_THRESHOLD_DEFAULT);
|
DFSConfigKeys.DFS_DATANODE_SLOW_IO_WARNING_THRESHOLD_DEFAULT);
|
||||||
|
|
Loading…
Reference in New Issue