Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HDFS-17273. Improve local variables duration of DataStreamer for better debugging. #6321

Merged
merged 4 commits into from
Dec 24, 2023
+13 −12
Merged

HDFS-17273. Improve local variables duration of DataStreamer for better debugging. #6321

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
847cf34
HDFS-17273. Change the way of computing some local variables duration…
hfutatzhanghb Dec 4, 2023
6a31532
fix checkstyle
hfutatzhanghb Dec 4, 2023
75bd7b0
use lib funtion.
hfutatzhanghb Dec 8, 2023
759c5e7
fix checkstyle
hfutatzhanghb Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions ...op-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,8 @@ boolean doWaitForRestart() {
private final String[] favoredNodes;
private final EnumSet<AddBlockFlag> addBlockFlags;

private static final long NANOSECONDS_PER_MILLISECOND = 1000000;

private DataStreamer(HdfsFileStatus stat, ExtendedBlock block,
DFSClient dfsClient, String src,
Progressable progress, DataChecksum checksum,
Expand Down Expand Up @@ -758,7 +760,7 @@ public void run() {
scope = null;
dataQueue.removeFirst();
ackQueue.addLast(one);
packetSendTime.put(one.getSeqno(), Time.monotonicNow());
packetSendTime.put(one.getSeqno(), Time.monotonicNowNanos());
dataQueue.notifyAll();
}
}
Expand Down Expand Up @@ -924,7 +926,7 @@ void waitForAckedSeqno(long seqno) throws IOException {
dnodes = nodes != null ? nodes.length : 3;
}
int writeTimeout = dfsClient.getDatanodeWriteTimeout(dnodes);
long begin = Time.monotonicNow();
long begin = Time.monotonicNowNanos();
try {
synchronized (dataQueue) {
while (!streamerClosed) {
Expand All @@ -934,14 +936,14 @@ void waitForAckedSeqno(long seqno) throws IOException {
}
try {
dataQueue.wait(1000); // when we receive an ack, we notify on
long duration = Time.monotonicNow() - begin;
if (duration > writeTimeout) {
long duration = Time.monotonicNowNanos() - begin;
hfutatzhanghb marked this conversation as resolved.
Show resolved Hide resolved
if (duration > writeTimeout * NANOSECONDS_PER_MILLISECOND) {
LOG.error("No ack received, took {}ms (threshold={}ms). "
+ "File being written: {}, block: {}, "
+ "Write pipeline datanodes: {}.",
duration, writeTimeout, src, block, nodes);
duration / NANOSECONDS_PER_MILLISECOND, writeTimeout, src, block, nodes);
throw new InterruptedIOException("No ack received after " +
duration / 1000 + "s and a timeout of " +
duration / 1000 / NANOSECONDS_PER_MILLISECOND + "s and a timeout of " +
writeTimeout / 1000 + "s");
}
// dataQueue
Expand All @@ -955,11 +957,11 @@ void waitForAckedSeqno(long seqno) throws IOException {
} catch (ClosedChannelException cce) {
LOG.debug("Closed channel exception", cce);
}
long duration = Time.monotonicNow() - begin;
if (duration > dfsclientSlowLogThresholdMs) {
long duration = Time.monotonicNowNanos() - begin;
hfutatzhanghb marked this conversation as resolved.
Show resolved Hide resolved
if (duration > dfsclientSlowLogThresholdMs * NANOSECONDS_PER_MILLISECOND) {
LOG.warn("Slow waitForAckedSeqno took {}ms (threshold={}ms). File being"
+ " written: {}, block: {}, Write pipeline datanodes: {}.",
duration, dfsclientSlowLogThresholdMs, src, block, nodes);
duration / NANOSECONDS_PER_MILLISECOND, dfsclientSlowLogThresholdMs, src, block, nodes);
}
}
}
Expand Down Expand Up @@ -1150,10 +1152,10 @@ public void run() {
if (ack.getSeqno() != DFSPacket.HEART_BEAT_SEQNO) {
Long begin = packetSendTime.get(ack.getSeqno());
if (begin != null) {
long duration = Time.monotonicNow() - begin;
if (duration > dfsclientSlowLogThresholdMs) {
long duration = Time.monotonicNowNanos() - begin;
hfutatzhanghb marked this conversation as resolved.
Show resolved Hide resolved
if (duration > dfsclientSlowLogThresholdMs * NANOSECONDS_PER_MILLISECOND) {
LOG.info("Slow ReadProcessor read fields for block " + block
+ " took " + duration + "ms (threshold="
+ " took " + duration / NANOSECONDS_PER_MILLISECOND + "ms (threshold="
+ dfsclientSlowLogThresholdMs + "ms); ack: " + ack
+ ", targets: " + Arrays.asList(targets));
}
Expand Down