You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by je...@apache.org on 2016/02/18 06:03:01 UTC
[8/9] storm git commit: fixing config naming
fixing config naming
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/969ebaf7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/969ebaf7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/969ebaf7
Branch: refs/heads/master
Commit: 969ebaf76cded1efffe7c02cae675950ccee1c4b
Parents: e19dafb
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Tue Feb 16 20:42:02 2016 -0600
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Tue Feb 16 20:42:02 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 2 +-
storm-core/src/jvm/org/apache/storm/Config.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/969ebaf7/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index dd29afe..4b4bac3 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@ -1162,7 +1162,7 @@
command (if (conf STORM-RESOURCE-ISOLATION-PLUGIN-ENABLE)
(do
(.reserveResourcesForWorker (:resource-isolation-manager supervisor) worker-id
- {"cpu" cpu "memory" (+ mem-onheap mem-offheap (int (Math/ceil (conf STORM-CGROUP-MEMORY-MB-LIMIT-TOLERANCE-MARGIN))))})
+ {"cpu" cpu "memory" (+ mem-onheap mem-offheap (int (Math/ceil (conf STORM-CGROUP-MEMORY-LIMIT-TOLERANCE-MARGIN-MB))))})
(.getLaunchCommand (:resource-isolation-manager supervisor) worker-id
(java.util.ArrayList. (java.util.Arrays/asList (to-array command)))))
command)]
http://git-wip-us.apache.org/repos/asf/storm/blob/969ebaf7/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java
index 931afce..a8cf4e2 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -2260,7 +2260,7 @@ public class Config extends HashMap<String, Object> {
* The amount of memory a worker can exceed its allocation before cgroup will kill it
*/
@isPositiveNumber
- public static String STORM_CGROUP_MEMORY_MB_LIMIT_TOLERANCE_MARGIN = "storm.cgroup.memory.mb.limit.tolerance.margin";
+ public static String STORM_CGROUP_MEMORY_LIMIT_TOLERANCE_MARGIN_MB = "storm.cgroup.memory.limit.tolerance.margin.mb";
public static void setClasspath(Map conf, String cp) {
conf.put(Config.TOPOLOGY_CLASSPATH, cp);