You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/12/12 11:57:08 UTC
[1/2] storm git commit: STORM-3297 prevent supervisor restart when no
nimbus leader exists
Repository: storm
Updated Branches:
refs/heads/master f5b3f93fc -> 43859e9e8
STORM-3297 prevent supervisor restart when no nimbus leader exists
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/afa173f6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/afa173f6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/afa173f6
Branch: refs/heads/master
Commit: afa173f694b648694f1dd8b2d0c4ac0dc6f8529d
Parents: 94cd157
Author: Aaron Gresch <ag...@yahoo-inc.com>
Authored: Wed Dec 5 11:27:43 2018 -0600
Committer: Aaron Gresch <ag...@yahoo-inc.com>
Committed: Tue Dec 11 13:25:06 2018 -0600
----------------------------------------------------------------------
.../java/org/apache/storm/metricstore/NimbusMetricProcessor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/afa173f6/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java b/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
index 491017c..4445d92 100644
--- a/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
+++ b/storm-server/src/main/java/org/apache/storm/metricstore/NimbusMetricProcessor.java
@@ -15,6 +15,7 @@ import java.util.Map;
import org.apache.storm.generated.WorkerMetrics;
import org.apache.storm.thrift.TException;
import org.apache.storm.utils.NimbusClient;
+import org.apache.storm.utils.NimbusLeaderNotFoundException;
/**
* Implementation of WorkerMetricsProcessor that sends metric data to Nimbus for processing.
@@ -24,7 +25,7 @@ public class NimbusMetricProcessor implements WorkerMetricsProcessor {
public void processWorkerMetrics(Map<String, Object> conf, WorkerMetrics metrics) throws MetricException {
try (NimbusClient client = NimbusClient.getConfiguredClient(conf)) {
client.getClient().processWorkerMetrics(metrics);
- } catch (TException e) {
+ } catch (TException | NimbusLeaderNotFoundException e) {
throw new MetricException("Failed to process metrics", e);
}
}
[2/2] storm git commit: Merge branch 'agresch_processWorkerMetrics'
of https://github.com/agresch/storm into asfgit-master
Posted by sr...@apache.org.
Merge branch 'agresch_processWorkerMetrics' of https://github.com/agresch/storm into asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/43859e9e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/43859e9e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/43859e9e
Branch: refs/heads/master
Commit: 43859e9e82ad419d09756702395b2747c7326eaa
Parents: f5b3f93 afa173f
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Tue Dec 11 20:28:30 2018 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Tue Dec 11 20:28:30 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/storm/metricstore/NimbusMetricProcessor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------