feat(api): ignore worker model group name in requirement when startin…

…g worker (#4261)
ovh · May 7, 2019 · 9e58713 · 9e58713
1 parent 3af23cd
commit 9e58713
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/engine/hatchery/swarm/swarm_util_create.go b/engine/hatchery/swarm/swarm_util_create.go
@@ -199,7 +199,7 @@ func (h *HatcherySwarm) computeDockerOpts(isSharedInfra bool, requirements []sdk
 
 func (d *dockerOpts) computeDockerOptsOnModelRequirement(isSharedInfra bool, req sdk.Requirement) error {
 	// args are separated by a space
-	// example: golang:1.9.1 --port=8080:8080/tcp
+	// example: myGroup/golang:1.9.1 --port=8080:8080/tcp
 	for idx, opt := range strings.Split(req.Value, " ") {
 		if idx == 0 || strings.TrimSpace(opt) == "" {
 			continue // it's image name

diff --git a/engine/worker/requirement.go b/engine/worker/requirement.go
@@ -115,11 +115,12 @@ func checkModelRequirement(w *currentWorker, r sdk.Requirement) (bool, error) {
 	if w.model.ID == 0 {
 		return false, nil
 	}
-	t := strings.Split(r.Value, " ")
-	if len(t) > 0 {
-		return t[0] == w.model.Name, nil
+	modelName := strings.Split(r.Value, " ")[0]
+	modelPath := strings.SplitN(modelName, "/", 2)
+	if len(modelPath) == 2 {
+		modelName = modelPath[1]
 	}
-	return false, nil
+	return modelName == w.model.Name, nil
 }
 
 func checkNetworkAccessRequirement(w *currentWorker, r sdk.Requirement) (bool, error) {

diff --git a/sdk/hatchery/hatchery.go b/sdk/hatchery/hatchery.go
@@ -363,7 +363,7 @@ func canRunJob(h Interface, j workerStarterRequest, model sdk.Model) bool {
 				modelName = modelPath[1]
 			}
 			if modelName != model.Name {
-				log.Debug("canRunJob> %d - job %d - model requirement r.Value(%s) != model.Name(%s)", j.timestamp, j.id, strings.Split(r.Value, " ")[0], model.Name)
+				log.Debug("canRunJob> %d - job %d - model requirement from requirement r.Value(%s) don't match model.Name(%s)", j.timestamp, j.id, r.Value, model.Name)
 				return false
 			}
 		}