FIX: [API] restart service.

Author: andreaspeters

api/V0ComposeRestartService.go

@@ -1,11 +1,13 @@
 package api
 
 import (
+	"time"
 	"net/http"
 
 	cfg "github.com/AVENTER-UG/mesos-compose/types"
 	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
+	"github.com/AVENTER-UG/util/util"
 )
 
 // V0ComposeRestartService will restart a service from a specific project
@@ -41,22 +43,49 @@ func (e *API) V0ComposeRestartService(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	logrus.WithField("func", "api.V0ComposeRestartService").Infof("Restart Tasks the service %s in project %s", project, servicename)
+	logrus.WithField("func", "api.V0ComposeRestartService").Infof("Restart the service %s in project %s", project, servicename)
 
+	// generate new task as copy of old task
+	newTask := new(cfg.Command)
 	for keys.Next(e.Redis.CTX) {
 		key := e.Redis.GetRedisKey(keys.Val())
 		task := e.Mesos.DecodeTask(key)
-		newTask := new(cfg.Command)
 		*newTask = *task
 		task.State = "__KILL"
 		task.Restart = "no"
 		e.Redis.SaveTaskRedis(task)
 
 		logrus.WithField("func", "api.V0ComposeRestartService").Tracef("Restart Task (%s) of service \"%s\" in project \"%s\"", task.TaskID, project, servicename)
+	}
+
+	go e.increaseAfterKill(newTask, project, servicename)
+}
+
+// increaseAfterKill
+// check every 5 seconds if all tasks of this service is killed.
+// if it so, start a new
+func (e *API) increaseAfterKill(task *cfg.Command, project, serviceName string) {
+	done := false
+	ticker := time.NewTicker(5 * time.Second)
+	defer ticker.Stop()
+
+	for !done {
+		select {
+		case <-ticker.C:
+			if e.Redis.CountRedisKey(e.Config.PrefixTaskName + ":" + project + ":" + serviceName + ":*", "") <= 0 {
+				done = true
+
+				logrus.WithField("func", "api.increaseAfterKill").Infof("Restart Task %s", serviceName)
 
-		// generate new task as copy of old task
-		newTask.TaskID = e.IncreaseTaskCount(newTask.TaskID)
-		newTask.State = ""
-		e.Redis.SaveTaskRedis(newTask)
+				uuid, err := util.GenUUID()
+				if err != nil {
+					logrus.WithField("func", "api.increaseAfterKill").Error("Error during create uuid: ", err.Error())
+					return
+				}
+				task.TaskID = e.IncreaseTaskCount(project + "_" + serviceName + "." + uuid)
+				task.State = ""
+				e.Redis.SaveTaskRedis(task)
+			}
+		}
 	}
 }

api/V0ComposeRestartTask.go

@@ -53,7 +53,6 @@ func (e *API) Commands() *mux.Router {
 	rtr.HandleFunc("/api/compose/versions", e.Versions).Methods("GET")
 	rtr.HandleFunc("/api/compose/v0/tasks", e.V0ShowAllTasks).Methods("GET")
 	rtr.HandleFunc("/api/compose/v0/tasks/{taskid}", e.V0ComposeKillTask).Methods("DELETE")
-	rtr.HandleFunc("/api/compose/v0/tasks/{taskid}/restart", e.V0ComposeRestartTask).Methods("PUT")
 	rtr.HandleFunc("/api/compose/v0/framework/reregister", e.V0FrameworkReRegister).Methods("PUT")
 	rtr.HandleFunc("/api/compose/v0/framework/suppress", e.V0FrameworkSuppress).Methods("PUT")
 	rtr.HandleFunc("/api/compose/v0/framework", e.V0FrameworkRemoveID).Methods("DELETE")

api/api.go

@@ -103,6 +103,8 @@ func (e *API) getRuntime(cmd *cfg.Command) []*mesosproto.Parameter {
 
 	if e.getContainerType() == "docker" && e.Service.Deploy.Runtime != "" {
 		param = e.addDockerParameter(param, "runtime", strings.ToLower(e.Service.Deploy.Runtime))
+		param = e.addDockerParameter(param, "memory-swap", "0")
+		param = e.addDockerParameter(param, "cpu-shares", "0")
 	}
 
 	return param

api/compose.go

@@ -2,15 +2,17 @@
 
 ## master
 
+- CHANGE: !!!! If compose.networks is set, the network mode will be automaticly "user".
+       It can be overwritten if compose.networks.driver is set. !!!!
 - ADD: Enable/Disable event handling as own thread (ENV Variable THREAD_ENABLE)
 - ADD: API Endpoint to cleanup the Framework ID. That will force a resubscription under
        a new Framework ID.
-- CHANGE: !!!! If compose.networks is set, the network mode will be automaticly "user".
-       It can be overwritten if compose.networks.driver is set. !!!!
 - 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
+- FIX: [API] Restart service
+- DEL: [API] Remove useless restart task API
 
 ## v1.1.3
 

changelog.md

@@ -16,7 +16,7 @@ services:
     network_mode: "user"    
     network: default
     deploy:
-      replicas: 1
+      replicas: 2
 
 networks:
   default:

docs/example/test-http.yaml

@@ -119,8 +119,8 @@ class mesosCompose(PluginBase):
         "restart": {
             "arguments": ["<framework-name>", "<task>"],
             "flags": {},
-            "short_help": "Restart a single task (ID) or a whole service (Task Name)",
-            "long_help": "Use the \"ID\" to restart a single task or the \"Task Name\" to restart the entire service."
+            "short_help": "Restart a whole service (Task Name)",
+            "long_help": "Use \"Task Name\" to restart the entire service."
         },
         "framework": {
             "arguments": ["<framework-name>", "<operations>"],

mesos_cli/compose/main.py

@@ -16,7 +16,7 @@ func (e *Scheduler) HandleOffers(offers *mesosproto.Event_Offers) error {
 	select {
 	case cmd := <-e.Framework.CommandChan:
 		// if no taskid or taskname is given, it's a wrong task.
-		if cmd.TaskID == "" || cmd.TaskName == "" || cmd.Killed {
+		if cmd.TaskID == "" || cmd.TaskName == "" {
 			return nil
 		}
 

scheduler/handle_offers.go

@@ -28,7 +28,10 @@ func (e *Scheduler) HandleUpdate(event *mesosproto.Event) {
 		return
 	}
 
-	task.State = update.Status.State.String()
+	// don't update state message if the task is in KILL state
+	if task.State != "__KILL" {
+		task.State = update.Status.State.String()
+	}
 
 	logrus.WithField("func", "scheduler.HandleUpdate").Tracef("Event %s, State %s, TaskID %s", event.GetType().String(), task.State, task.TaskID)
 
@@ -70,7 +73,6 @@ func (e *Scheduler) HandleUpdate(event *mesosproto.Event) {
 		e.Redis.DelRedisKey(task.TaskName + ":" + task.TaskID)
 		task.TaskID = e.API.IncreaseTaskCount(task.TaskID)
 		task.State = ""
-		task.Killed = false
 		break
 	case mesosproto.TaskState_TASK_LOST:
 		if task.TaskID == "" {

scheduler/handle_update.go

@@ -22,7 +22,7 @@ func (e *Scheduler) Heartbeat() {
 
 		task := e.Mesos.DecodeTask(key)
 
-		if task.TaskID == "" || task.TaskName == "" || task.Killed {
+		if task.TaskID == "" || task.TaskName == "" {
 			continue
 		}
 
@@ -34,7 +34,6 @@ func (e *Scheduler) Heartbeat() {
 				continue
 			} else {
 				task.Restart = "no"
-				task.Killed = true
 				e.Redis.SaveTaskRedis(task)
 				e.Mesos.Kill(task.TaskID, task.Agent)
 			}