Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding support to mesos-role #770

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding support to mesos-role #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosJobFramework.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually the reverse logic. The original version of this method was correct.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can double check to see if this rejects * role offers, my cluster currently does not have any agents with * role

(
getScalarValueOrElse(reservedResources.find(x => x.getName == "cpus"), 0),
getScalarValueOrElse(reservedResources.find(x => x.getName == "mem"), 0)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/org/apache/mesos/chronos/scheduler/mesos/MesosTaskBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look right either.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brndnmtthws Resource was taking * as the hardcoded value. Now the conf value set in --mesos-role is used. I have tested in mesos using multiple chronos frameworks and various roles. My cluster now does not have * roles. Also using Resource.newBuilder we can only setRole. Its's not possible to add multiple roles.

.build
}

Expand Down