HDFS-9572. Prevent DataNode log spam if a client connects on the data transfer port but sends no data. Contributed by Chris Nauroth

(cherry picked from commit 03bab8dea1)
(cherry picked from commit 294d0f6f6a)
This commit is contained in:
cnauroth 2015-12-17 14:04:45 -08:00
parent c8e5d2eba4
commit 12e6f38f52
2 changed files with 11 additions and 11 deletions

View File

@ -1600,6 +1600,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9515. NPE when MiniDFSCluster#shutdown is invoked on uninitialized
reference. (Wei-Chiu Chuang via Arpit Agarwal)
HDFS-9572. Prevent DataNode log spam if a client connects on the data
transfer port but sends no data. (cnauroth)
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES

View File

@ -233,18 +233,15 @@ class DataXceiver extends Receiver implements Runnable {
} catch (InterruptedIOException ignored) {
// Time out while we wait for client rpc
break;
} catch (IOException err) {
// Since we optimistically expect the next op, it's quite normal to get EOF here.
if (opsProcessed > 0 &&
(err instanceof EOFException || err instanceof ClosedChannelException)) {
if (LOG.isDebugEnabled()) {
LOG.debug("Cached " + peer + " closing after " + opsProcessed + " ops");
}
} else {
incrDatanodeNetworkErrors();
throw err;
}
} catch (EOFException | ClosedChannelException e) {
// Since we optimistically expect the next op, it's quite normal to
// get EOF here.
LOG.debug("Cached {} closing after {} ops. " +
"This message is usually benign.", peer, opsProcessed);
break;
} catch (IOException err) {
incrDatanodeNetworkErrors();
throw err;
}
// restore normal timeout