SLIDER-982 chaos monkey to not log @ info if its not actually active
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ca6f9cee Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ca6f9cee Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ca6f9cee Branch: refs/heads/feature/SLIDER-82-pass-3.1 Commit: ca6f9cee09b4b6c7b6dee83bdd06268e8ddd4d50 Parents: c4e7329 Author: Steve Loughran <[email protected]> Authored: Thu Nov 12 13:58:50 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Thu Nov 12 14:01:31 2015 +0000 ---------------------------------------------------------------------- .../slider/server/appmaster/SliderAppMaster.java | 2 +- .../server/appmaster/monkey/ChaosKillContainer.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ca6f9cee/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index df91d7f..3d062b5 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -2206,7 +2206,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService internals.getOptionBool(InternalKeys.CHAOS_MONKEY_ENABLED, InternalKeys.DEFAULT_CHAOS_MONKEY_ENABLED); if (!enabled) { - log.info("Chaos monkey disabled"); + log.debug("Chaos monkey disabled"); return false; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ca6f9cee/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java index a5cdfc6..ae38e4c 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosKillContainer.java @@ -72,15 +72,13 @@ public class ChaosKillContainer implements ChaosTarget { } } int size = liveContainers.size(); - if (size <= 0) { - log.info("No containers to kill"); - return; - } - int target = random.nextInt(size); - RoleInstance roleInstance = liveContainers.get(target); - log.info("Killing {}", roleInstance); + if (size > 0) { + int target = random.nextInt(size); + RoleInstance roleInstance = liveContainers.get(target); + log.info("Killing {}", roleInstance); - queues.schedule(new ActionKillContainer(roleInstance.getId(), - DELAY, TimeUnit.MILLISECONDS, operationHandler)); + queues.schedule(new ActionKillContainer(roleInstance.getId(), + DELAY, TimeUnit.MILLISECONDS, operationHandler)); + } } }
