HDFS-16554. Remove unused configuration dfs.namenode.block.deletion.increment. (#4213). Contributed by Chengwei Wang.
This commit is contained in:
parent
2632d49282
commit
f187e9bcd5
@ -484,11 +484,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
|
||||
public static final String DFS_NAMENODE_STARTUP_DELAY_BLOCK_DELETION_SEC_KEY = "dfs.namenode.startup.delay.block.deletion.sec";
|
||||
public static final long DFS_NAMENODE_STARTUP_DELAY_BLOCK_DELETION_SEC_DEFAULT = 0L;
|
||||
|
||||
/** Block deletion increment. */
|
||||
public static final String DFS_NAMENODE_BLOCK_DELETION_INCREMENT_KEY =
|
||||
"dfs.namenode.block.deletion.increment";
|
||||
public static final int DFS_NAMENODE_BLOCK_DELETION_INCREMENT_DEFAULT = 1000;
|
||||
|
||||
/** The limit of single lock holding duration.*/
|
||||
public static final String DFS_NAMENODE_BLOCK_DELETION_LOCK_THRESHOLD_MS =
|
||||
"dfs.namenode.block.deletion.lock.threshold.ms";
|
||||
|
@ -502,7 +502,6 @@ private boolean isClientPortInfoAbsent(CallerContext ctx){
|
||||
private final boolean standbyShouldCheckpoint;
|
||||
private final boolean isSnapshotTrashRootEnabled;
|
||||
private final int snapshotDiffReportLimit;
|
||||
private final int blockDeletionIncrement;
|
||||
|
||||
/**
|
||||
* Whether enable checkOperation when call getBlocks.
|
||||
@ -1065,12 +1064,6 @@ static FSNamesystem loadFromDisk(Configuration conf) throws IOException {
|
||||
this.allowOwnerSetQuota = conf.getBoolean(
|
||||
DFSConfigKeys.DFS_PERMISSIONS_ALLOW_OWNER_SET_QUOTA_KEY,
|
||||
DFSConfigKeys.DFS_PERMISSIONS_ALLOW_OWNER_SET_QUOTA_DEFAULT);
|
||||
this.blockDeletionIncrement = conf.getInt(
|
||||
DFSConfigKeys.DFS_NAMENODE_BLOCK_DELETION_INCREMENT_KEY,
|
||||
DFSConfigKeys.DFS_NAMENODE_BLOCK_DELETION_INCREMENT_DEFAULT);
|
||||
Preconditions.checkArgument(blockDeletionIncrement > 0,
|
||||
DFSConfigKeys.DFS_NAMENODE_BLOCK_DELETION_INCREMENT_KEY +
|
||||
" must be a positive integer.");
|
||||
this.isGetBlocksCheckOperationEnabled = conf.getBoolean(
|
||||
DFSConfigKeys.DFS_NAMENODE_GETBLOCKS_CHECK_OPERATION_KEY,
|
||||
DFSConfigKeys.DFS_NAMENODE_GETBLOCKS_CHECK_OPERATION_DEFAULT);
|
||||
|
@ -6144,16 +6144,6 @@
|
||||
</description>
|
||||
</property>
|
||||
|
||||
<property>
|
||||
<name>dfs.namenode.block.deletion.increment</name>
|
||||
<value>1000</value>
|
||||
<description>
|
||||
The number of block deletion increment.
|
||||
This setting will control the block increment deletion rate to
|
||||
ensure that other waiters on the lock can get in.
|
||||
</description>
|
||||
</property>
|
||||
|
||||
<property>
|
||||
<name>dfs.namenode.block.deletion.lock.threshold.ms</name>
|
||||
<value>50</value>
|
||||
|
@ -51,7 +51,6 @@ public class TestLargeDirectoryDelete {
|
||||
static {
|
||||
CONF.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1);
|
||||
CONF.setInt(DFSConfigKeys.DFS_BYTES_PER_CHECKSUM_KEY, 1);
|
||||
CONF.setInt(DFSConfigKeys.DFS_NAMENODE_BLOCK_DELETION_INCREMENT_KEY, 1);
|
||||
}
|
||||
|
||||
/** create a file with a length of <code>filelen</code> */
|
||||
|
Loading…
Reference in New Issue
Block a user