ADD: mesos attribute support.

Author: andreaspeters

README.md

@@ -166,6 +166,9 @@ services:
         port:
     deploy:
       runtime: "runcvm"
+      attributes:
+          - "gpus: True"
+          - "airflow: True"
       placement:
         constraints:
           - "node.hostname==localhost"

api/compose.go

@@ -66,17 +66,33 @@ func (e *API) mapComposeServiceToMesosTask(vars map[string]string, name string,
 	cmd.Uris = e.getURIs()
 	cmd.Arguments = e.getArguments()
 
-
 	// set healthcheck if it's configured
 	e.setHealthCheck(cmd)
 
 	// set the docker constraints
 	e.setConstraints(cmd)
 
+  // set mesos attributes
+  e.setAttributes(cmd)
+
 	// store/update the mesos task in db
 	e.Redis.SaveTaskRedis(cmd)
 }
 
+// set mesos attributes
+func (e *API) setAttributes(cmd *cfg.Command) {
+	if len(e.Service.Deploy.Placement.Attributes) > 0 {
+		for _, attribute := range e.Service.Deploy.Placement.Attributes {
+			if strings.Contains(attribute, ":") {
+				attr := strings.Split(attribute, ":")
+				if len(attr) >= 2 {
+					cmd.Attributes = append(cmd.Attributes, &mesosproto.Label{Key: util.StringToPointer(attr[0]), Value: &attr[1]})
+				}
+			}
+		}
+	}
+}
+
 // Set the Runtime (https://github.com/newsnowlabs/runcvm)
 func (e *API) getRuntime(cmd *cfg.Command) []*mesosproto.Parameter {
 	param := cmd.DockerParameter

changelog.md

@@ -10,6 +10,7 @@
 - ADD: Support for AMD and NVIDIA GPUs.
 - ADD: Mesos Framework GPU Capabilities to get GPU offers from mesos.
 - ADD: Runtime support for docker container (https://github.com/newsnowlabs/runcvm)
+- ADD: Support for Mesos attributes
 
 ## v1.1.3
 

docs/example/mesos-compose.yml

@@ -74,6 +74,9 @@ services:
     deploy:
       runtime: "runcvm"
       placement:
+        attributes:
+          - "gpus: True"
+          - "airflow: True"
         constraints:
           - "node.hostname==localhost"
           - "node.platform.os==linux"

docs/src/README.md

@@ -88,6 +88,9 @@ services:
     deploy:
       runtime: "runcvm"
       placement:
+        attributes:
+          - "gpus: True"
+          - "airflow: True"
         constraints:
           - "node.hostname==localhost"
           - "node.platform.os==linux"

scheduler/handle_offers.go

@@ -138,7 +138,13 @@ func (e *Scheduler) getOffer(offers *mesosproto.Event_Offers, cmd *cfg.Command)
 			continue
 		}
 
-		// if the ressources of this offer does not matched what the command need, the skip
+		// if the attributes of this offer does not matched what the command need, then skip
+		if !e.matchAttributes(cmd, offer) {
+			logrus.WithField("func", "scheduler.getOffer").Debug("Could not found any matched attributes, get next offer")
+			continue
+		}
+
+		// if the ressources of this offer does not matched what the command need, then skip
 		if !e.Mesos.IsRessourceMatched(offer.Resources, cmd) {
 			logrus.WithField("func", "scheduler.getOffer").Debug("Could not found any matched ressources, get next offer")
 			continue
@@ -155,6 +161,22 @@ func (e *Scheduler) getOffer(offers *mesosproto.Event_Offers, cmd *cfg.Command)
 	return offerret, offerIds
 }
 
+// search matched mesos attributes. if cmd does not has any attributes,
+// then the result would be true.
+func (e *Scheduler) matchAttributes(cmd *cfg.Command, offer *mesosproto.Offer) bool {
+	if len(cmd.Attributes) <= 0 {
+		return true
+	}
+
+  ret := false;
+	for _, attribute := range cmd.Attributes {
+		if strings.EqualFold("true", e.getAttributes(*attribute.Key, offer)) {
+			ret = ret && true
+		}
+	}
+	return ret
+}
+
 // search matched mesos attributes
 func (e *Scheduler) getAttributes(name string, offer *mesosproto.Offer) string {
 	for _, attribute := range offer.Attributes {

types/types.go

@@ -133,6 +133,7 @@ type Deploy struct {
 
 // Placement - The docker-compose placement
 type Placement struct {
+	Attributes  []string `yaml:"attributes"`
 	Constraints []string `yaml:"constraints"`
 }
 
@@ -222,6 +223,7 @@ type Command struct {
 	EnableHealthCheck  bool
 	Health             *mesosproto.HealthCheck
 	MesosAgent         MesosSlaves
+	Attributes         []*mesosproto.Label
 }
 
 // State will have the state of all tasks stated by this framework