HDFS-15551. Tiny Improve for DeadNode detector (#2265)
Contributed by imbajin. Reviewed-by: leosunli <lisheng.sun08@gmail.com> Signed-off-by: He Xiaoqiao <hexiaoqiao@apache.org>
This commit is contained in:
parent
56ebabd426
commit
89428f142f
|
@ -181,10 +181,13 @@ public class DFSInputStream extends FSInputStream
|
|||
private byte[] oneByteBuf; // used for 'int read()'
|
||||
|
||||
protected void addToLocalDeadNodes(DatanodeInfo dnInfo) {
|
||||
DFSClient.LOG.debug("Add {} to local dead nodes, previously was {}.",
|
||||
dnInfo, deadNodes);
|
||||
deadNodes.put(dnInfo, dnInfo);
|
||||
}
|
||||
|
||||
protected void removeFromLocalDeadNodes(DatanodeInfo dnInfo) {
|
||||
DFSClient.LOG.debug("Remove {} from local dead nodes.", dnInfo);
|
||||
deadNodes.remove(dnInfo);
|
||||
}
|
||||
|
||||
|
|
|
@ -294,7 +294,7 @@ public class DeadNodeDetector implements Runnable {
|
|||
}
|
||||
|
||||
/**
|
||||
* Prode datanode by probe byte.
|
||||
* Prode datanode by probe type.
|
||||
*/
|
||||
private void scheduleProbe(ProbeType type) {
|
||||
LOG.debug("Schedule probe datanode for probe type: {}.", type);
|
||||
|
@ -376,9 +376,8 @@ public class DeadNodeDetector implements Runnable {
|
|||
} catch (Exception e) {
|
||||
LOG.error("Probe failed, datanode: {}, type: {}.", datanodeInfo, type,
|
||||
e);
|
||||
deadNodeDetector.probeCallBack(this, false);
|
||||
}
|
||||
|
||||
deadNodeDetector.probeCallBack(this, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -402,7 +401,7 @@ public class DeadNodeDetector implements Runnable {
|
|||
}
|
||||
} else {
|
||||
if (probe.getType() == ProbeType.CHECK_SUSPECT) {
|
||||
LOG.info("Add the node to dead node list: {}.",
|
||||
LOG.warn("Probe failed, add suspect node to dead node list: {}.",
|
||||
probe.getDatanodeInfo());
|
||||
addToDead(probe.getDatanodeInfo());
|
||||
}
|
||||
|
@ -415,11 +414,12 @@ public class DeadNodeDetector implements Runnable {
|
|||
private void checkDeadNodes() {
|
||||
Set<DatanodeInfo> datanodeInfos = clearAndGetDetectedDeadNodes();
|
||||
for (DatanodeInfo datanodeInfo : datanodeInfos) {
|
||||
LOG.debug("Add dead node to check: {}.", datanodeInfo);
|
||||
if (!deadNodesProbeQueue.offer(datanodeInfo)) {
|
||||
LOG.debug("Skip to add dead node {} to check " +
|
||||
"since the probe queue is full.", datanodeInfo);
|
||||
break;
|
||||
} else {
|
||||
LOG.debug("Add dead node to check: {}.", datanodeInfo);
|
||||
}
|
||||
}
|
||||
state = State.IDLE;
|
||||
|
@ -475,6 +475,7 @@ public class DeadNodeDetector implements Runnable {
|
|||
datanodeInfos.add(datanodeInfo);
|
||||
}
|
||||
|
||||
LOG.debug("Add datanode {} to suspectAndDeadNodes.", datanodeInfo);
|
||||
addSuspectNodeToDetect(datanodeInfo);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue