You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/11/24 23:50:42 UTC
[1/5] storm git commit: making small fixes
Repository: storm
Updated Branches:
refs/heads/master fc3b8773e -> 5a71ea07c
making small fixes
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ef716467
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ef716467
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ef716467
Branch: refs/heads/master
Commit: ef716467caaada143c951fb88223dd476f72557a
Parents: 1afa5a2
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Wed Nov 18 12:59:14 2015 -0600
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Wed Nov 18 12:59:14 2015 -0600
----------------------------------------------------------------------
.../backtype/storm/scheduler/resource/ResourceAwareScheduler.java | 2 +-
.../storm/scheduler/resource/strategies/ResourceAwareStrategy.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ef716467/storm-core/src/jvm/backtype/storm/scheduler/resource/ResourceAwareScheduler.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/scheduler/resource/ResourceAwareScheduler.java b/storm-core/src/jvm/backtype/storm/scheduler/resource/ResourceAwareScheduler.java
index 6e455f2..5b700d6 100644
--- a/storm-core/src/jvm/backtype/storm/scheduler/resource/ResourceAwareScheduler.java
+++ b/storm-core/src/jvm/backtype/storm/scheduler/resource/ResourceAwareScheduler.java
@@ -58,7 +58,7 @@ public class ResourceAwareScheduler implements IScheduler {
for (TopologyDetails td : topologies.getTopologies()) {
String topId = td.getId();
Map<WorkerSlot, Collection<ExecutorDetails>> schedulerAssignmentMap;
- if (cluster.needsScheduling(td) && cluster.getUnassignedExecutors(td).size() > 0) {
+ if (cluster.getUnassignedExecutors(td).size() > 0) {
LOG.debug("/********Scheduling topology {} ************/", topId);
schedulerAssignmentMap = RAStrategy.schedule(td);
http://git-wip-us.apache.org/repos/asf/storm/blob/ef716467/storm-core/src/jvm/backtype/storm/scheduler/resource/strategies/ResourceAwareStrategy.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/scheduler/resource/strategies/ResourceAwareStrategy.java b/storm-core/src/jvm/backtype/storm/scheduler/resource/strategies/ResourceAwareStrategy.java
index b8a96a2..3fe37dd 100644
--- a/storm-core/src/jvm/backtype/storm/scheduler/resource/strategies/ResourceAwareStrategy.java
+++ b/storm-core/src/jvm/backtype/storm/scheduler/resource/strategies/ResourceAwareStrategy.java
@@ -263,7 +263,7 @@ public class ResourceAwareStrategy implements IStrategy {
private Double distToNode(RAS_Node src, RAS_Node dest) {
if (src.getId().equals(dest.getId())) {
return 0.0;
- } else if (this.NodeToCluster(src) == this.NodeToCluster(dest)) {
+ } else if (this.NodeToCluster(src).equals(this.NodeToCluster(dest))) {
return 0.5;
} else {
return 1.0;
[5/5] storm git commit: Merge branch 'STORM-1217-merge'
Posted by da...@apache.org.
Merge branch 'STORM-1217-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5a71ea07
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5a71ea07
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5a71ea07
Branch: refs/heads/master
Commit: 5a71ea07c71dd15854a30f5ecb555b19f0a4e59b
Parents: fc3b877 e182624
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Nov 24 16:50:15 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Nov 24 16:50:15 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
.../src/jvm/storm/starter/ResourceAwareExampleTopology.java | 2 +-
.../backtype/storm/scheduler/resource/ResourceAwareScheduler.java | 2 +-
.../storm/scheduler/resource/strategies/ResourceAwareStrategy.java | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[4/5] storm git commit: STORM-1217
Posted by da...@apache.org.
STORM-1217
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e182624e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e182624e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e182624e
Branch: refs/heads/master
Commit: e182624eb5ba5d7e7561dc8bb2ae23e1217bc5be
Parents: 05c7004
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Nov 24 16:48:38 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Nov 24 16:48:38 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e182624e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2661422..b116116 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -151,6 +151,7 @@
* STORM-1142: Some config validators for positive ints need to allow 0
* STORM-901: Worker Artifacts Directory
* STORM-1144: Display requested and assigned cpu/mem resources for schedulers in UI
+ * STORM-1217: making small fixes in RAS
## 0.10.0-beta2
* STORM-1108: Fix NPE in simulated time
[2/5] storm git commit: modifying config for RAS example topology
Posted by da...@apache.org.
modifying config for RAS example topology
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3c89f923
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3c89f923
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3c89f923
Branch: refs/heads/master
Commit: 3c89f923512fef343fdde983f289675dca2bcb0b
Parents: ef71646
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Fri Nov 20 12:27:54 2015 -0600
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Fri Nov 20 12:27:54 2015 -0600
----------------------------------------------------------------------
.../src/jvm/storm/starter/ResourceAwareExampleTopology.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3c89f923/examples/storm-starter/src/jvm/storm/starter/ResourceAwareExampleTopology.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/storm/starter/ResourceAwareExampleTopology.java b/examples/storm-starter/src/jvm/storm/starter/ResourceAwareExampleTopology.java
index c43a1bc..e8225d4 100644
--- a/examples/storm-starter/src/jvm/storm/starter/ResourceAwareExampleTopology.java
+++ b/examples/storm-starter/src/jvm/storm/starter/ResourceAwareExampleTopology.java
@@ -82,7 +82,7 @@ public class ResourceAwareExampleTopology {
* Use to limit the maximum amount of memory (in MB) allocated to one worker process.
* Can be used to spread executors to to multiple workers
*/
- conf.setTopologyWorkerMaxHeapSize(512.0);
+ conf.setTopologyWorkerMaxHeapSize(1024.0);
if (args != null && args.length > 0) {
conf.setNumWorkers(3);
[3/5] storm git commit: Merge branch 'RAS_small_fixes' of
https://github.com/jerrypeng/storm into STORM-1217-merge
Posted by da...@apache.org.
Merge branch 'RAS_small_fixes' of https://github.com/jerrypeng/storm into STORM-1217-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/05c70044
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/05c70044
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/05c70044
Branch: refs/heads/master
Commit: 05c70044f8f98fdf50e8753781525449f77fe6b6
Parents: fc3b877 3c89f92
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Nov 24 16:47:13 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Nov 24 16:47:13 2015 -0600
----------------------------------------------------------------------
.../src/jvm/storm/starter/ResourceAwareExampleTopology.java | 2 +-
.../backtype/storm/scheduler/resource/ResourceAwareScheduler.java | 2 +-
.../storm/scheduler/resource/strategies/ResourceAwareStrategy.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/05c70044/storm-core/src/jvm/backtype/storm/scheduler/resource/ResourceAwareScheduler.java
----------------------------------------------------------------------