You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/09/07 18:41:15 UTC
[1/2] storm git commit: STORM-2635 Deep log search doesn’t work when there’s no topology in topology history
Repository: storm
Updated Branches:
refs/heads/master dad14e414 -> 3ee9a899c
STORM-2635 Deep log search doesn’t work when there’s no topology in topology history
* just fix the NPE issue
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9833f544
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9833f544
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9833f544
Branch: refs/heads/master
Commit: 9833f5449e598b7f257a229e64ed2f479c4d07ac
Parents: e1dd247
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Aug 31 14:33:43 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Aug 31 14:33:43 2017 +0900
----------------------------------------------------------------------
storm-core/test/clj/org/apache/storm/nimbus_test.clj | 4 ++++
.../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 8 ++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9833f544/storm-core/test/clj/org/apache/storm/nimbus_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/nimbus_test.clj b/storm-core/test/clj/org/apache/storm/nimbus_test.clj
index 5c4e0d7..c4f3fad 100644
--- a/storm-core/test/clj/org/apache/storm/nimbus_test.clj
+++ b/storm-core/test/clj/org/apache/storm/nimbus_test.clj
@@ -537,6 +537,10 @@
(TestPlannerSpout. true) (Integer. 4))}
{}))
(bind state (.getClusterState cluster))
+ ; get topology history when there's no topology history
+ (let [hist-topo-ids (vec (sort (.get_topo_ids (.getTopologyHistory (.getNimbus cluster) (System/getProperty "user.name")))))]
+ (log-message "Checking user " (System/getProperty "user.name") " " hist-topo-ids)
+ (is (= 0 (count hist-topo-ids))))
(.submitTopology cluster "test" {TOPOLOGY-MESSAGE-TIMEOUT-SECS 20, LOGS-USERS ["alice", (System/getProperty "user.name")]} topology)
(bind storm-id (StormCommon/getStormId state "test"))
(.advanceClusterTime cluster 5)
http://git-wip-us.apache.org/repos/asf/storm/blob/9833f544/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
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 fb2c3e1..5fcf1ec 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
@@ -2116,9 +2116,13 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
private List<String> readTopologyHistory(String user, Collection<String> adminUsers) throws IOException {
LocalState state = topologyHistoryState;
+ List<LSTopoHistory> topoHistoryList = state.getTopoHistoryList();
+ if (topoHistoryList == null || topoHistoryList.isEmpty()) {
+ return Collections.emptyList();
+ }
+
List<String> ret = new ArrayList<>();
- for (LSTopoHistory history: state.getTopoHistoryList()) {
-
+ for (LSTopoHistory history: topoHistoryList) {
if (user == null || //Security off
adminUsers.contains(user) || //is admin
isUserPartOf(user, history.get_groups()) || //is in allowed group
[2/2] storm git commit: Merge branch 'STORM-2635' of
https://github.com/HeartSaVioR/storm into STORM-2635
Posted by bo...@apache.org.
Merge branch 'STORM-2635' of https://github.com/HeartSaVioR/storm into STORM-2635
STORM-2635 Deep log search doesn’t work when there’s no topology in topology history
This closes #2302
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3ee9a899
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3ee9a899
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3ee9a899
Branch: refs/heads/master
Commit: 3ee9a899c3f4cfb4c5ad1dca5dd8a62740fa2ce8
Parents: dad14e4 9833f54
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Sep 7 13:12:00 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Sep 7 13:12:00 2017 -0500
----------------------------------------------------------------------
storm-core/test/clj/org/apache/storm/nimbus_test.clj | 4 ++++
.../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 8 ++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3ee9a899/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------