Skip to content

HDFS-4277. SocketTimeoutExceptions over the DataXceiver service of a DN should print the DFSClient ID #8271

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

Open
balodesecurity wants to merge 1 commit into
base: trunk
Choose a base branch
from
+11 −9
Open

HDFS-4277. SocketTimeoutExceptions over the DataXceiver service of a DN should print the DFSClient ID #8271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions ...project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,9 @@ public void run() {
} catch (Throwable t) {
String s = datanode.getDisplayName() + ":DataXceiver error processing "
+ ((op == null) ? "unknown" : op.name()) + " operation "
+ " src: " + remoteAddress + " dst: " + localAddress;
+ " src: " + remoteAddress + " dst: " + localAddress
+ (previousOpClientName != null
? " clientName: " + previousOpClientName : "");
if (op == Op.WRITE_BLOCK && t instanceof ReplicaAlreadyExistsException) {
// For WRITE_BLOCK, it is okay if the replica already exists since
// client and replication may write the same block to the same datanode
Expand Down Expand Up @@ -645,8 +647,8 @@ public void readBlock(final ExtendedBlock block,
datanode.metrics.incrTotalReadTime(TimeUnit.NANOSECONDS.toMillis(durationInNS));
DFSUtil.addTransferRateMetric(datanode.metrics, read, durationInNS);
} catch ( SocketException ignored ) {
LOG.trace("{}:Ignoring exception while serving {} to {}",
dnR, block, remoteAddress, ignored);
LOG.trace("{}:Ignoring exception while serving {} to {} for client {}",
dnR, block, remoteAddress, clientName, ignored);
// Its ok for remote side to close the connection anytime.
datanode.metrics.incrBlocksRead();
IOUtils.closeStream(out);
Expand All @@ -655,8 +657,8 @@ public void readBlock(final ExtendedBlock block,
* Earlier version shutdown() datanode if there is disk error.
*/
if (!(ioe instanceof SocketTimeoutException)) {
LOG.warn("{}:Got exception while serving {} to {}",
dnR, block, remoteAddress, ioe);
LOG.warn("{}:Got exception while serving {} to {} for client {}",
dnR, block, remoteAddress, clientName, ioe);
incrDatanodeNetworkErrors();
}
// Normally the client reports a bad block to the NN. However if the
Expand Down Expand Up @@ -949,8 +951,8 @@ public void writeBlock(final ExtendedBlock block,
size = block.getNumBytes();
}
} catch (IOException ioe) {
LOG.info("opWriteBlock {} received exception {}",
block, ioe.toString());
LOG.info("opWriteBlock {} received exception {} from client {}",
block, ioe.toString(), clientname);
incrDatanodeNetworkErrors();
throw ioe;
} finally {
Expand Down Expand Up @@ -991,8 +993,8 @@ public void transferBlock(final ExtendedBlock blk,
targetStorageTypes, targetStorageIds, clientName);
writeResponse(Status.SUCCESS, null, out);
} catch (IOException ioe) {
LOG.info("transferBlock {} received exception {}",
blk, ioe.toString());
LOG.info("transferBlock {} received exception {} from client {}",
blk, ioe.toString(), clientName);
incrDatanodeNetworkErrors();
throw ioe;
} finally {
Expand Down