You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sa...@apache.org on 2016/11/21 04:40:27 UTC
[1/2] storm git commit: STORM-2205 Handle race condition for nimbuses
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch 315d45ba0 -> 55f556712
STORM-2205 Handle race condition for nimbuses
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9f5d870e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9f5d870e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9f5d870e
Branch: refs/heads/1.0.x-branch
Commit: 9f5d870e0862128e5da9cf09c0a198dfc5eeda68
Parents: 315d45b
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Thu Nov 17 14:10:19 2016 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Mon Nov 21 10:05:52 2016 +0530
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/cluster.clj | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9f5d870e/storm-core/src/clj/org/apache/storm/cluster.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/cluster.clj b/storm-core/src/clj/org/apache/storm/cluster.clj
index 914fa5b..810b3c3 100644
--- a/storm-core/src/clj/org/apache/storm/cluster.clj
+++ b/storm-core/src/clj/org/apache/storm/cluster.clj
@@ -320,8 +320,11 @@
(nimbuses
[this]
- (map #(maybe-deserialize (.get_data cluster-state (nimbus-path %1) false) NimbusSummary)
- (.get_children cluster-state NIMBUSES-SUBTREE false)))
+ ;; remove any null instances which can exist because of a race condition in which
+ ;; - nimbus nodes in zk may have been removed when connections are reconnected after getting children in
+ ;; /nimbuses node in zk.
+ (remove nil? (map #(maybe-deserialize (.get_data cluster-state (nimbus-path %1) false) NimbusSummary)
+ (.get_children cluster-state NIMBUSES-SUBTREE false))))
(add-nimbus-host!
[this nimbus-id nimbus-summary]
[2/2] storm git commit: Added STORM-2205 to CHANGELOG.md
Posted by sa...@apache.org.
Added STORM-2205 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/55f55671
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/55f55671
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/55f55671
Branch: refs/heads/1.0.x-branch
Commit: 55f5567123567203bd586d56ac7ce83c17f796e4
Parents: 9f5d870
Author: Satish Duggana <sd...@hortonworks.com>
Authored: Mon Nov 21 10:07:20 2016 +0530
Committer: Satish Duggana <sd...@hortonworks.com>
Committed: Mon Nov 21 10:07:20 2016 +0530
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/55f55671/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42aba3d..b63ac36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * storm-2205: Racecondition in getting nimbus summaries while ZK connections are reconnected
* STORM-2198: perform RotationAction when stopping HdfsBolt
* STORM-2196: A typo in RAS_Node::consumeCPU
* STORM-2189: RAS_Node::freeCPU outputs incorrect info