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 sn...@apache.org on 2022/10/15 19:51:33 UTC
[hadoop] branch trunk updated: YARN-10680. Revisit try blocks without catch blocks but having finally blocks. Contributed by Susheel Gupta
This is an automated email from the ASF dual-hosted git repository.
snemeth 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 b0d5182c310 YARN-10680. Revisit try blocks without catch blocks but having finally blocks. Contributed by Susheel Gupta
b0d5182c310 is described below
commit b0d5182c31043d70d614d3378c42974d6f468b27
Author: Szilard Nemeth <sn...@apache.org>
AuthorDate: Sat Oct 15 21:51:08 2022 +0200
YARN-10680. Revisit try blocks without catch blocks but having finally blocks. Contributed by Susheel Gupta
---
.../apache/hadoop/yarn/sls/scheduler/SLSCapacityScheduler.java | 10 +++++++++-
.../org/apache/hadoop/yarn/sls/scheduler/SLSFairScheduler.java | 10 +++++++++-
.../org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java | 8 +++++++-
3 files changed, 25 insertions(+), 3 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 18e12cca05f..6cc4cf7597e 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
@@ -36,6 +36,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.Capacity
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.common.ResourceCommitRequest;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
import org.apache.hadoop.yarn.sls.SLSRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Private
@Unstable
@@ -45,6 +47,7 @@ public class SLSCapacityScheduler extends CapacityScheduler implements
private final SLSSchedulerCommons schedulerCommons;
private Configuration conf;
private SLSRunner runner;
+ private static final Logger LOG = LoggerFactory.getLogger(SLSCapacityScheduler.class);
public SLSCapacityScheduler() {
schedulerCommons = new SLSSchedulerCommons(this);
@@ -105,7 +108,12 @@ public class SLSCapacityScheduler extends CapacityScheduler implements
@Override
public void handle(SchedulerEvent schedulerEvent) {
- schedulerCommons.handle(schedulerEvent);
+ try {
+ schedulerCommons.handle(schedulerEvent);
+ } catch(Exception e) {
+ LOG.error("Caught exception while handling scheduler event", e);
+ throw e;
+ }
}
@Override
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 1b4d5ced69b..beb411025f8 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
@@ -31,6 +31,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ContainerUpdates;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
import org.apache.hadoop.yarn.sls.SLSRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.List;
@@ -40,6 +42,7 @@ public class SLSFairScheduler extends FairScheduler
implements SchedulerWrapper, Configurable {
private final SLSSchedulerCommons schedulerCommons;
private SLSRunner runner;
+ private static final Logger LOG = LoggerFactory.getLogger(SLSFairScheduler.class);
public SLSFairScheduler() {
schedulerCommons = new SLSSchedulerCommons(this);
@@ -63,7 +66,12 @@ public class SLSFairScheduler extends FairScheduler
@Override
public void handle(SchedulerEvent schedulerEvent) {
- schedulerCommons.handle(schedulerEvent);
+ try {
+ schedulerCommons.handle(schedulerEvent);
+ } catch (Exception e){
+ LOG.error("Caught exception while handling scheduler event", e);
+ throw e;
+ }
}
@Override
diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
index a1e530a6f77..f66cf4384d9 100644
--- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
+++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/SchedulerMetrics.java
@@ -178,7 +178,7 @@ public abstract class SchedulerMetrics {
pool.scheduleAtFixedRate(new HistogramsRunnable(), 0, 1000,
TimeUnit.MILLISECONDS);
- // a thread to output metrics for real-tiem tracking
+ // a thread to output metrics for real-time tracking
pool.scheduleAtFixedRate(new MetricsLogRunnable(), 0, 1000,
TimeUnit.MILLISECONDS);
@@ -467,6 +467,9 @@ public abstract class SchedulerMetrics {
schedulerHistogramList.add(histogram);
histogramTimerMap.put(histogram, schedulerHandleTimerMap.get(e));
}
+ } catch (Exception e) {
+ LOG.error("Caught exception while registering scheduler metrics", e);
+ throw e;
} finally {
samplerLock.unlock();
}
@@ -510,6 +513,9 @@ public abstract class SchedulerMetrics {
}
);
}
+ } catch (Exception e) {
+ LOG.error("Caught exception while registering nodes usage metrics", e);
+ throw e;
} finally {
samplerLock.unlock();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org