Skip to content

Commit c491f81

Browse files
authored
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 643dfd6 commit c491f81

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
@@ -1876,18 +1876,16 @@ public DatanodeCommand[] handleHeartbeat(DatanodeRegistration nodeReg,
18761876
*
18771877
* @param nodeReg registration info for DataNode sending the lifeline
18781878
* @param reports storage reports from DataNode
1879-
* @param blockPoolId block pool ID
18801879
* @param cacheCapacity cache capacity at DataNode
18811880
* @param cacheUsed cache used at DataNode
18821881
* @param xceiverCount estimated count of transfer threads running at DataNode
1883-
* @param maxTransfers count of transfers running at DataNode
18841882
* @param failedVolumes count of failed volumes at DataNode
18851883
* @param volumeFailureSummary info on failed volumes at DataNode
18861884
* @throws IOException if there is an error
18871885
*/
18881886
public void handleLifeline(DatanodeRegistration nodeReg,
1889-
StorageReport[] reports, String blockPoolId, long cacheCapacity,
1890-
long cacheUsed, int xceiverCount, int maxTransfers, int failedVolumes,
1887+
StorageReport[] reports, long cacheCapacity,
1888+
long cacheUsed, int xceiverCount, int failedVolumes,
18911889
VolumeFailureSummary volumeFailureSummary) throws IOException {
18921890
if (LOG.isDebugEnabled()) {
18931891
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
@@ -4416,9 +4416,8 @@ void handleLifeline(DatanodeRegistration nodeReg, StorageReport[] reports,
44164416
long cacheCapacity, long cacheUsed, int xceiverCount, int xmitsInProgress,
44174417
int failedVolumes, VolumeFailureSummary volumeFailureSummary)
44184418
throws IOException {
4419-
int maxTransfer = blockManager.getMaxReplicationStreams() - xmitsInProgress;
44204419
blockManager.getDatanodeManager().handleLifeline(nodeReg, reports,
4421-
getBlockPoolId(), cacheCapacity, cacheUsed, xceiverCount, maxTransfer,
4420+
cacheCapacity, cacheUsed, xceiverCount,
44224421
failedVolumes, volumeFailureSummary);
44234422
}
44244423

0 commit comments

Comments
 (0)