Skip to content

Commit 00bd7b2

Browse files
tomscutayushtkn
authored andcommitted
HDFS-16078. Remove unused parameters for DatanodeManager.handleLifeline() (#3119). Contributed by tomscut.
Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
1 parent c14f3e4 commit 00bd7b2

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,18 +1776,16 @@ public DatanodeCommand[] handleHeartbeat(DatanodeRegistration nodeReg,
17761776
*
17771777
* @param nodeReg registration info for DataNode sending the lifeline
17781778
* @param reports storage reports from DataNode
1779-
* @param blockPoolId block pool ID
17801779
* @param cacheCapacity cache capacity at DataNode
17811780
* @param cacheUsed cache used at DataNode
17821781
* @param xceiverCount estimated count of transfer threads running at DataNode
1783-
* @param maxTransfers count of transfers running at DataNode
17841782
* @param failedVolumes count of failed volumes at DataNode
17851783
* @param volumeFailureSummary info on failed volumes at DataNode
17861784
* @throws IOException if there is an error
17871785
*/
17881786
public void handleLifeline(DatanodeRegistration nodeReg,
1789-
StorageReport[] reports, String blockPoolId, long cacheCapacity,
1790-
long cacheUsed, int xceiverCount, int maxTransfers, int failedVolumes,
1787+
StorageReport[] reports, long cacheCapacity,
1788+
long cacheUsed, int xceiverCount, int failedVolumes,
17911789
VolumeFailureSummary volumeFailureSummary) throws IOException {
17921790
if (LOG.isDebugEnabled()) {
17931791
LOG.debug("Received handleLifeline from nodeReg = " + nodeReg);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4020,9 +4020,8 @@ void handleLifeline(DatanodeRegistration nodeReg, StorageReport[] reports,
40204020
long cacheCapacity, long cacheUsed, int xceiverCount, int xmitsInProgress,
40214021
int failedVolumes, VolumeFailureSummary volumeFailureSummary)
40224022
throws IOException {
4023-
int maxTransfer = blockManager.getMaxReplicationStreams() - xmitsInProgress;
40244023
blockManager.getDatanodeManager().handleLifeline(nodeReg, reports,
4025-
getBlockPoolId(), cacheCapacity, cacheUsed, xceiverCount, maxTransfer,
4024+
cacheCapacity, cacheUsed, xceiverCount,
40264025
failedVolumes, volumeFailureSummary);
40274026
}
40284027

0 commit comments

Comments
 (0)