You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/10/01 04:33:11 UTC
[1/3] storm git commit: STORM-2066: make error message in
IsolatedPool.java more descriptive
Repository: storm
Updated Branches:
refs/heads/1.x-branch b29b6f0e7 -> 311da9578
STORM-2066: make error message in IsolatedPool.java more descriptive
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d6305d76
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d6305d76
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d6305d76
Branch: refs/heads/1.x-branch
Commit: d6305d76c3c16f8c0b2a57615759b367988acb22
Parents: b29b6f0
Author: Alessandro Bellina <ab...@yahoo-inc.com>
Authored: Mon Aug 29 17:41:30 2016 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 1 13:32:36 2016 +0900
----------------------------------------------------------------------
.../apache/storm/scheduler/multitenant/IsolatedPool.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d6305d76/storm-core/src/jvm/org/apache/storm/scheduler/multitenant/IsolatedPool.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/scheduler/multitenant/IsolatedPool.java b/storm-core/src/jvm/org/apache/storm/scheduler/multitenant/IsolatedPool.java
index 75dc583..f16e4fa 100644
--- a/storm-core/src/jvm/org/apache/storm/scheduler/multitenant/IsolatedPool.java
+++ b/storm-core/src/jvm/org/apache/storm/scheduler/multitenant/IsolatedPool.java
@@ -215,7 +215,15 @@ public class IsolatedPool extends NodePool {
int slotsFree = Node.countFreeSlotsAlive(allNodes);
int slotsToUse = Math.min(slotsRequested - slotsUsed, slotsFree);
if (slotsToUse <= 0) {
- _cluster.setStatus(topId, "Node has partially crashed, if this situation persists rebalance the topology.");
+ // if # of workers requested is more than we currently have
+ if (origRequest > slotsUsed) {
+ _cluster.setStatus(topId, "Running with fewer slots than requested " + slotsUsed + "/" +
+ origRequest + " on " + allNodes.size() + " node(s) with " + (slotsUsed + slotsFree) + " total slots");
+ } else {
+ // if # of workers requested is less than we took
+ // then we know some workers we track died, since we have more workers than we are supposed to have
+ _cluster.setStatus(topId, "Node has partially crashed, if this situation persists rebalance the topology.");
+ }
}
return slotsToUse;
}
[3/3] storm git commit: add STORM-2066 to CHANGELOG
Posted by ka...@apache.org.
add STORM-2066 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/311da957
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/311da957
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/311da957
Branch: refs/heads/1.x-branch
Commit: 311da9578adde2831d8a8125beca49fd8e35df9b
Parents: d236ffd
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Oct 1 13:32:59 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 1 13:32:59 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/311da957/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0237c3..e094079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.1.0
+ * STORM-2066: make error message in IsolatedPool.java more descriptive
* STORM-1870: Allow FluxShellBolt/Spout set custom "componentConfig" via yaml
* STORM-2126: fix NPE due to race condition in compute-new-sched-assign\u2026
* STORM-2124: show requested cpu mem for each component
[2/3] storm git commit: Merge branch 'STORM-2066-1.x' into 1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2066-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d236ffd8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d236ffd8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d236ffd8
Branch: refs/heads/1.x-branch
Commit: d236ffd888ae6f90e2129521e29159f909a9692e
Parents: b29b6f0 d6305d7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Oct 1 13:32:41 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 1 13:32:41 2016 +0900
----------------------------------------------------------------------
.../apache/storm/scheduler/multitenant/IsolatedPool.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------