You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by pb...@apache.org on 2021/03/09 13:02:29 UTC
[hadoop] branch trunk updated: YARN-10679. Better logging of
uncaught exceptions throughout SLS. Contributed by Szilard Nemeth.
This is an automated email from the ASF dual-hosted git repository.
pbacsko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new c3aa413 YARN-10679. Better logging of uncaught exceptions throughout SLS. Contributed by Szilard Nemeth.
c3aa413 is described below
commit c3aa413ee3f8b111124fb216d7136e71d3b0b770
Author: Peter Bacsko <pb...@cloudera.com>
AuthorDate: Tue Mar 9 14:02:12 2021 +0100
YARN-10679. Better logging of uncaught exceptions throughout SLS. Contributed by Szilard Nemeth.
---
.../apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java | 7 +++----
.../org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java | 6 +++---
.../java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java | 6 +++++-
.../src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java | 8 ++++++--
4 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
index a318204..e0cb151 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java
@@ -63,7 +63,6 @@ import com.codahale.metrics.Timer;
@Unstable
public class SLSCapacityScheduler extends CapacityScheduler implements
SchedulerWrapper,Configurable {
-
private Configuration conf;
private Map<ApplicationAttemptId, String> appQueueMap =
@@ -99,7 +98,7 @@ public class SLSCapacityScheduler extends CapacityScheduler implements
CapacityScheduler.class);
schedulerMetrics.init(this, conf);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error("Caught exception while initializing schedulerMetrics", e);
}
}
}
@@ -129,7 +128,7 @@ public class SLSCapacityScheduler extends CapacityScheduler implements
updateQueueWithAllocateRequest(allocation, attemptId,
resourceRequests, containerIds);
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error("Caught exception while executing finally block", e);
}
}
} else {
@@ -376,7 +375,7 @@ public class SLSCapacityScheduler extends CapacityScheduler implements
schedulerMetrics.tearDown();
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error("Caught exception while stopping service", e);
}
super.serviceStop();
}
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
index 7298c05..84549bc 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java
@@ -92,7 +92,7 @@ public class SLSFairScheduler extends FairScheduler
FairScheduler.class);
schedulerMetrics.init(this, conf);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error("Caught exception while initializing schedulerMetrics", e);
}
}
}
@@ -122,7 +122,7 @@ public class SLSFairScheduler extends FairScheduler
updateQueueWithAllocateRequest(allocation, attemptId,
resourceRequests, containerIds);
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error("Caught exception while executing finally block", e);
}
}
} else {
@@ -332,7 +332,7 @@ public class SLSFairScheduler extends FairScheduler
schedulerMetrics.tearDown();
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error("Caught exception while stopping service", e);
}
super.serviceStop();
}
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
index 19cfe88..1678455 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/TaskRunner.java
@@ -26,10 +26,14 @@ import java.util.concurrent.TimeUnit;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Private
@Unstable
public class TaskRunner {
+ private static final Logger LOG = LoggerFactory.getLogger(TaskRunner.class);
+
@Private
@Unstable
public abstract static class Task implements Runnable, Delayed {
@@ -98,7 +102,7 @@ public class TaskRunner {
lastStep();
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error("Caught exception while executing Taskrunner", e);
Thread.getDefaultUncaughtExceptionHandler()
.uncaughtException(Thread.currentThread(), e);
}
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
index b3b7a82..191c462 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/web/SLSWebApp.java
@@ -50,10 +50,14 @@ import com.codahale.metrics.Counter;
import com.codahale.metrics.Gauge;
import com.codahale.metrics.Histogram;
import com.codahale.metrics.MetricRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Private
@Unstable
public class SLSWebApp extends HttpServlet {
+ private static final Logger LOG = LoggerFactory.getLogger(SLSWebApp.class);
+
private static final long serialVersionUID = 1905162041950251407L;
private transient Server server;
private transient SchedulerWrapper wrapper;
@@ -101,7 +105,7 @@ public class SLSWebApp extends HttpServlet {
trackTemplate = IOUtils.toString(
cl.getResourceAsStream("html/track.html.template"), StandardCharsets.UTF_8);
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error("Caught exception while initializing templates", e);
}
}
@@ -166,7 +170,7 @@ public class SLSWebApp extends HttpServlet {
printJsonTrack(request, response);
}
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error("Caught exception while starting SLSWebApp", e);
}
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org