Repository: hadoop Updated Branches: refs/heads/branch-2 a4bb56b93 -> 1f6258f53
HDFS-7283. Bump DataNode OOM log from WARN to ERROR. Contributed by Stephen Chu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1f6258f5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1f6258f5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1f6258f5 Branch: refs/heads/branch-2 Commit: 1f6258f535f114b88d9be038ffbcf23f7621dba3 Parents: a4bb56b Author: Haohui Mai <[email protected]> Authored: Fri Oct 24 10:50:16 2014 -0700 Committer: Haohui Mai <[email protected]> Committed: Fri Oct 24 10:50:28 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f6258f5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5c70021..f08112c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -47,6 +47,9 @@ Release 2.7.0 - UNRELEASED HDFS-7223. Tracing span description of IPC client is too long (iwasakims via cmccabe) + HDFS-7283. Bump DataNode OOM log from WARN to ERROR. + (Stephen Chu via wheat9) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f6258f5/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java index a1f766d..9bf95eb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java @@ -161,7 +161,7 @@ class DataXceiverServer implements Runnable { // DataNode can run out of memory if there is too many transfers. // Log the event, Sleep for 30 seconds, other transfers may complete by // then. - LOG.warn("DataNode is out of memory. Will retry in 30 seconds.", ie); + LOG.error("DataNode is out of memory. Will retry in 30 seconds.", ie); try { Thread.sleep(30 * 1000); } catch (InterruptedException e) {
