You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by go...@apache.org on 2019/05/22 18:38:00 UTC
[storm] branch master updated (ab0b750 -> c5356f0)
This is an automated email from the ASF dual-hosted git repository.
govind pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git.
from ab0b750 Merge branch 'YSTORM-5412' of https://github.com/dandsager1/storm into STORM-3392-merge
new 2bbc826 STORM-3394 Fix placeholder system bolt filtering for Topology page
new 19b1aa6 STORM-3394 Fix placeholder system bolt filtering for Topology page
new 7d385a5 Add () to clarify intent
new 969fea6 replaced __system with Constants.SYSTEM_COMPONENT_ID
new c5356f0 Merge branch 'YSTORM-6355' of github.com:dandsager1/storm into YSTORM-6355
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
[storm] 05/05: Merge branch 'YSTORM-6355' of
github.com:dandsager1/storm into YSTORM-6355
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
govind pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
commit c5356f01846c6899b4fe752c5acac9f149ce3d77
Merge: 2bbc826 969fea6
Author: dandsager <da...@verizonmedia.com>
AuthorDate: Wed May 22 11:54:11 2019 -0500
Merge branch 'YSTORM-6355' of github.com:dandsager1/storm into YSTORM-6355
[storm] 01/05: STORM-3394 Fix placeholder system bolt filtering for
Topology page
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
govind pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
commit 19b1aa6c83634faaf96049cce7c88ba8de8b37d8
Author: dandsager <da...@verizonmedia.com>
AuthorDate: Fri May 17 13:16:21 2019 -0500
STORM-3394 Fix placeholder system bolt filtering for Topology page
---
.../main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index a65d63b..4eb7acd 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -4081,7 +4081,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
setResourcesDefaultIfNotSet(boltResources, entry.getKey(), topoConf);
commonStats.set_resources_map(boltResources.get(entry.getKey()).toNormalizedMap());
}
- maybeAddPlaceholderBoltAggStats(topoPageInfo, topology);
+ maybeAddPlaceholderBoltAggStats(topoPageInfo, topology, includeSys);
if (workerSummaries != null) {
topoPageInfo.set_workers(workerSummaries);
@@ -4145,7 +4145,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
private void maybeAddPlaceholderSpoutAggStats(TopologyPageInfo topoPageInfo, StormTopology topology) {
if (topoPageInfo.get_id_to_spout_agg_stats().isEmpty()) {
Map<String, SpoutSpec> spouts = topology.get_spouts();
- for (Entry<String, SpoutSpec> entry : spouts.entrySet()) {
+ for (String spoutName : spouts.keySet()) {
// component
ComponentAggregateStats placeholderComponentStats = new ComponentAggregateStats();
placeholderComponentStats.set_type(ComponentType.SPOUT);
@@ -4166,7 +4166,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
specificStats.set_spout(spoutAggStats);
placeholderComponentStats.set_specific_stats(specificStats);
- topoPageInfo.get_id_to_spout_agg_stats().put(entry.getKey(), placeholderComponentStats);
+ topoPageInfo.get_id_to_spout_agg_stats().put(spoutName, placeholderComponentStats);
}
}
}
@@ -4176,12 +4176,13 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
*
* @param topoPageInfo topology page info holding bolt AggStats
* @param topology storm topology used to get bolt names
+ * @param includeSys whether to show system bolts
*/
- private void maybeAddPlaceholderBoltAggStats(TopologyPageInfo topoPageInfo, StormTopology topology) {
+ private void maybeAddPlaceholderBoltAggStats(TopologyPageInfo topoPageInfo, StormTopology topology, boolean includeSys) {
if (topoPageInfo.get_id_to_bolt_agg_stats().isEmpty()) {
Map<String, Bolt> bolts = topology.get_bolts();
- for (Entry<String, Bolt> entry : bolts.entrySet()) {
- if (Utils.isSystemId(entry.getKey())) {
+ for (String boltName : bolts.keySet()) {
+ if (!includeSys && Utils.isSystemId(boltName) || boltName.equals("__system")) {
continue;
}
@@ -4208,7 +4209,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
specificStats.set_bolt(boltAggStats);
placeholderComponentStats.set_specific_stats(specificStats);
- topoPageInfo.get_id_to_bolt_agg_stats().put(entry.getKey(), placeholderComponentStats);
+ topoPageInfo.get_id_to_bolt_agg_stats().put(boltName, placeholderComponentStats);
}
}
}
[storm] 04/05: STORM-3394 Fix placeholder system bolt filtering for
Topology page
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
govind pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
commit 2bbc8262ccd4119f4c98886d3aaab9431b5d585c
Author: dandsager <da...@verizonmedia.com>
AuthorDate: Fri May 17 13:16:21 2019 -0500
STORM-3394 Fix placeholder system bolt filtering for Topology page
Add () to clarify intent
replaced __system with Constants.SYSTEM_COMPONENT_ID
---
.../main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index a65d63b..0f662de 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -4081,7 +4081,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
setResourcesDefaultIfNotSet(boltResources, entry.getKey(), topoConf);
commonStats.set_resources_map(boltResources.get(entry.getKey()).toNormalizedMap());
}
- maybeAddPlaceholderBoltAggStats(topoPageInfo, topology);
+ maybeAddPlaceholderBoltAggStats(topoPageInfo, topology, includeSys);
if (workerSummaries != null) {
topoPageInfo.set_workers(workerSummaries);
@@ -4145,7 +4145,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
private void maybeAddPlaceholderSpoutAggStats(TopologyPageInfo topoPageInfo, StormTopology topology) {
if (topoPageInfo.get_id_to_spout_agg_stats().isEmpty()) {
Map<String, SpoutSpec> spouts = topology.get_spouts();
- for (Entry<String, SpoutSpec> entry : spouts.entrySet()) {
+ for (String spoutName : spouts.keySet()) {
// component
ComponentAggregateStats placeholderComponentStats = new ComponentAggregateStats();
placeholderComponentStats.set_type(ComponentType.SPOUT);
@@ -4166,7 +4166,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
specificStats.set_spout(spoutAggStats);
placeholderComponentStats.set_specific_stats(specificStats);
- topoPageInfo.get_id_to_spout_agg_stats().put(entry.getKey(), placeholderComponentStats);
+ topoPageInfo.get_id_to_spout_agg_stats().put(spoutName, placeholderComponentStats);
}
}
}
@@ -4176,12 +4176,13 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
*
* @param topoPageInfo topology page info holding bolt AggStats
* @param topology storm topology used to get bolt names
+ * @param includeSys whether to show system bolts
*/
- private void maybeAddPlaceholderBoltAggStats(TopologyPageInfo topoPageInfo, StormTopology topology) {
+ private void maybeAddPlaceholderBoltAggStats(TopologyPageInfo topoPageInfo, StormTopology topology, boolean includeSys) {
if (topoPageInfo.get_id_to_bolt_agg_stats().isEmpty()) {
Map<String, Bolt> bolts = topology.get_bolts();
- for (Entry<String, Bolt> entry : bolts.entrySet()) {
- if (Utils.isSystemId(entry.getKey())) {
+ for (String boltName : bolts.keySet()) {
+ if ((!includeSys && Utils.isSystemId(boltName)) || boltName.equals(Constants.SYSTEM_COMPONENT_ID)) {
continue;
}
@@ -4208,7 +4209,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
specificStats.set_bolt(boltAggStats);
placeholderComponentStats.set_specific_stats(specificStats);
- topoPageInfo.get_id_to_bolt_agg_stats().put(entry.getKey(), placeholderComponentStats);
+ topoPageInfo.get_id_to_bolt_agg_stats().put(boltName, placeholderComponentStats);
}
}
}
[storm] 02/05: Add () to clarify intent
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
govind pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
commit 7d385a55e89f25faeb6155b1934194e4cbd9d887
Author: dandsager <da...@verizonmedia.com>
AuthorDate: Mon May 20 10:36:38 2019 -0500
Add () to clarify intent
---
storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index 4eb7acd..d1e37a8 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -4182,7 +4182,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
if (topoPageInfo.get_id_to_bolt_agg_stats().isEmpty()) {
Map<String, Bolt> bolts = topology.get_bolts();
for (String boltName : bolts.keySet()) {
- if (!includeSys && Utils.isSystemId(boltName) || boltName.equals("__system")) {
+ if ((!includeSys && Utils.isSystemId(boltName)) || boltName.equals("__system")) {
continue;
}
[storm] 03/05: replaced __system with Constants.SYSTEM_COMPONENT_ID
Posted by go...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
govind pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
commit 969fea6562e137957001a718864e65ece15f272b
Author: dandsager <da...@verizonmedia.com>
AuthorDate: Mon May 20 11:55:30 2019 -0500
replaced __system with Constants.SYSTEM_COMPONENT_ID
---
storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index d1e37a8..0f662de 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -4182,7 +4182,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
if (topoPageInfo.get_id_to_bolt_agg_stats().isEmpty()) {
Map<String, Bolt> bolts = topology.get_bolts();
for (String boltName : bolts.keySet()) {
- if ((!includeSys && Utils.isSystemId(boltName)) || boltName.equals("__system")) {
+ if ((!includeSys && Utils.isSystemId(boltName)) || boltName.equals(Constants.SYSTEM_COMPONENT_ID)) {
continue;
}