Repository: hadoop
Updated Branches:
refs/heads/branch-2 1619d8d62 -> bb6e28592
HADOOP-11958. MetricsSystemImpl fails to show backtrace when an error occurs
(Jason Lowe via jeagles)
(cherry picked from commit 2236b577a34b069c0d1f91da99f63a199f260ac2)
Conflicts:
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bb6e2859
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bb6e2859
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bb6e2859
Branch: refs/heads/branch-2
Commit: bb6e28592e1bfeaf1e9648d51a67b469af1472b1
Parents: 1619d8d
Author: Jonathan Eagles <[email protected]>
Authored: Wed Jun 24 14:51:04 2015 -0500
Committer: Jonathan Eagles <[email protected]>
Committed: Wed Jun 24 14:54:11 2015 -0500
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
.../java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb6e2859/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 894aa94..ed3e5f0 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -161,6 +161,8 @@ Release 2.8.0 - UNRELEASED
HADOOP-7139. Allow appending to existing SequenceFiles
(kanaka kumar avvaru via vinayakumarb)
+ HADOOP-11958. MetricsSystemImpl fails to show backtrace when an error
+ occurs (Jason Lowe via jeagles)
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb6e2859/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
----------------------------------------------------------------------
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
index b7f264b..fb2aa0e 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
@@ -368,9 +368,8 @@ public class MetricsSystemImpl extends MetricsSystem
implements MetricsSource {
public void run() {
try {
onTimerEvent();
- }
- catch (Exception e) {
- LOG.warn(e);
+ } catch (Exception e) {
+ LOG.warn("Error invoking metrics timer", e);
}
}
}, millis, millis);
