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 2015/11/20 23:26:32 UTC
[07/15] storm git commit: Minor
Minor
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/89fff440
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/89fff440
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/89fff440
Branch: refs/heads/master
Commit: 89fff440819836c78762b1c27fae8b005a752746
Parents: ce7085b
Author: zhuol <zh...@yahoo-inc.com>
Authored: Tue Nov 17 16:03:28 2015 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Nov 19 12:39:27 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 2 +-
storm-core/src/jvm/backtype/storm/Config.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/89fff440/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
index 176ce6b..71d4654 100644
--- a/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
@@ -746,7 +746,7 @@
;; the new assignments for all the topologies are in the cluster object.
_ (.schedule (:scheduler nimbus) topologies cluster)
_ (.setResourcesMap cluster @(:id->resources nimbus))
- _ (if-not (conf SCHEDULER-RESOURCE-DISPLAY) (.updateAssignedMemoryForTopologyAndSupervisor cluster topologies))
+ _ (if-not (conf SCHEDULER-DISPLAY-RESOURCE) (.updateAssignedMemoryForTopologyAndSupervisor cluster topologies))
_ (reset! (:id->sched-status nimbus) (.getStatusMap cluster))
_ (reset! (:node-id->resources nimbus) (.getSupervisorsResourcesMap cluster))
_ (reset! (:id->resources nimbus) (.getResourcesMap cluster))]
http://git-wip-us.apache.org/repos/asf/storm/blob/89fff440/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index afa200b..64476a0 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -180,7 +180,7 @@ public class Config extends HashMap<String, Object> {
* If this is not set, we will not display resource capacity and usage on the UI.
*/
@isBoolean
- public static final String SCHEDULER_RESOURCE_DISPLAY = "scheduler.display.resource";
+ public static final String SCHEDULER_DISPLAY_RESOURCE = "scheduler.display.resource";
/**
* The mode this Storm cluster is running in. Either "distributed" or "local".