Repository: aurora Updated Branches: refs/heads/master 246058df3 -> 218457b98
Increase executor resource epsilon to match the minimum required by Mesos. Bugs closed: AURORA-1246 Reviewed at https://reviews.apache.org/r/32861/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/218457b9 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/218457b9 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/218457b9 Branch: refs/heads/master Commit: 218457b9815a83d1e84598ca1c5912d87720eb5a Parents: 246058d Author: Stephan Erb <[email protected]> Authored: Wed Apr 8 21:46:11 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Wed Apr 8 21:46:11 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java | 2 +- .../java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/218457b9/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java b/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java index f55d1f4..1da35c0 100644 --- a/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java +++ b/src/main/java/org/apache/aurora/scheduler/async/GcExecutorLauncher.java @@ -79,7 +79,7 @@ public class GcExecutorLauncher implements TaskLauncher { // An epsilon is used because we are required to supply executor and task resources. @VisibleForTesting static final Resources EPSILON = - new Resources(0.01, Amount.of(1L, Data.MB), Amount.of(1L, Data.MB), 0); + new Resources(0.01, Amount.of(32L, Data.MB), Amount.of(1L, Data.MB), 0); private static final Resources GC_EXECUTOR_TASK_RESOURCES = Resources.subtract(TOTAL_GC_EXECUTOR_RESOURCES, EPSILON); http://git-wip-us.apache.org/repos/asf/aurora/blob/218457b9/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java b/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java index 8ae6865..e934f57 100644 --- a/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java +++ b/src/main/java/org/apache/aurora/scheduler/mesos/MesosTaskFactory.java @@ -109,7 +109,7 @@ public interface MesosTaskFactory { @VisibleForTesting static final Resources RESOURCES_EPSILON = new Resources( 0.01, - Amount.of(1L, Data.MB), + Amount.of(32L, Data.MB), Amount.of(1L, Data.MB), 0);
