From e5a8841d3138eb5b7ce7863b0b2a1c8452bb8b5c Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Wed, 21 Sep 2016 09:41:15 -0500 Subject: [PATCH 1/2] STORM-2109: Treat Supervisor CPU/MEMORY Configs as Numbers --- .../daemon/supervisor/timer/SupervisorHeartbeat.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java index 34c5682fb20..fdea1688c0f 100644 --- a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java +++ b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java @@ -72,10 +72,10 @@ private SupervisorInfo buildSupervisorInfo(Map conf, Supervisor private Map mkSupervisorCapacities(Map conf) { Map ret = new HashMap(); - Double mem = (double) (conf.get(Config.SUPERVISOR_MEMORY_CAPACITY_MB)); - ret.put(Config.SUPERVISOR_MEMORY_CAPACITY_MB, mem); - Double cpu = (double) (conf.get(Config.SUPERVISOR_CPU_CAPACITY)); - ret.put(Config.SUPERVISOR_CPU_CAPACITY, cpu); + Number mem = (Number) (conf.get(Config.SUPERVISOR_MEMORY_CAPACITY_MB)); + ret.put(Config.SUPERVISOR_MEMORY_CAPACITY_MB, mem.doubleValue()); + Number cpu = (Number) (conf.get(Config.SUPERVISOR_CPU_CAPACITY)); + ret.put(Config.SUPERVISOR_CPU_CAPACITY, cpu.doubleValue()); return ret; } From bf91e6d27912d02912d7220d2abeeaf05b8d5f0a Mon Sep 17 00:00:00 2001 From: "Robert (Bobby) Evans" Date: Fri, 23 Sep 2016 12:07:25 -0500 Subject: [PATCH 2/2] Addressed review comments --- .../daemon/supervisor/timer/SupervisorHeartbeat.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java index fdea1688c0f..849c584ec13 100644 --- a/storm-core/src/jvm/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java +++ b/storm-core/src/jvm/org/apache/storm/daemon/supervisor/timer/SupervisorHeartbeat.java @@ -72,10 +72,10 @@ private SupervisorInfo buildSupervisorInfo(Map conf, Supervisor private Map mkSupervisorCapacities(Map conf) { Map ret = new HashMap(); - Number mem = (Number) (conf.get(Config.SUPERVISOR_MEMORY_CAPACITY_MB)); - ret.put(Config.SUPERVISOR_MEMORY_CAPACITY_MB, mem.doubleValue()); - Number cpu = (Number) (conf.get(Config.SUPERVISOR_CPU_CAPACITY)); - ret.put(Config.SUPERVISOR_CPU_CAPACITY, cpu.doubleValue()); + Double mem = Utils.getDouble(conf.get(Config.SUPERVISOR_MEMORY_CAPACITY_MB), 4096.0); + ret.put(Config.SUPERVISOR_MEMORY_CAPACITY_MB, mem); + Double cpu = Utils.getDouble(conf.get(Config.SUPERVISOR_CPU_CAPACITY), 400.0); + ret.put(Config.SUPERVISOR_CPU_CAPACITY, cpu); return ret; }