From f0af4a6a353902540697efb7b01bd96ba84fb656 Mon Sep 17 00:00:00 2001 From: Vidhya Arvind Date: Wed, 28 Dec 2016 17:03:35 -0800 Subject: [PATCH] Adding support to mesos-role --- .../mesos/chronos/scheduler/mesos/MesosJobFramework.scala | 2 +- .../apache/mesos/chronos/scheduler/mesos/MesosTaskBuilder.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala b/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala index b24cf5897..174389903 100644 --- a/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala +++ b/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala @@ -73,7 +73,7 @@ class MesosJobFramework @Inject()( def getReservedResources(offer: Offer): (Double, Double) = { val resources = offer.getResourcesList.asScala - val reservedResources = resources.filter({ x => x.hasRole && x.getRole != "*" }) + val reservedResources = resources.filter({ x => x.hasRole && x.getRole != config.mesosRole()}) ( getScalarValueOrElse(reservedResources.find(x => x.getName == "cpus"), 0), getScalarValueOrElse(reservedResources.find(x => x.getName == "mem"), 0) diff --git a/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosTaskBuilder.scala b/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosTaskBuilder.scala index cb75f5720..33c23689f 100644 --- a/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosTaskBuilder.scala +++ b/src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosTaskBuilder.scala @@ -36,7 +36,7 @@ class MesosTaskBuilder @Inject()(val conf: SchedulerConfiguration) { .setName(name) .setType(Value.Type.SCALAR) .setScalar(Value.Scalar.newBuilder.setValue(value)) - .setRole("*") + .setRole(conf.mesosRole()) .build }