FIX: Force suppress after successfull framework subscription to prevent unwanted offers

Author: andreaspeters

changelog.md

@@ -13,6 +13,7 @@
 - ADD: Support for Mesos attributes
 - FIX: [API] Restart service
 - DEL: [API] Remove useless restart task API
+- FIX: Force suppress after successfull framework subscription to prevent offers
 
 ## v1.1.3
 

docs/example/mesos-compose.yml

@@ -91,8 +91,8 @@ services:
 networks:
   default:
     external: true
-    name: mesos-cni
-    driver: user
+    name: mesos-net
+    driver: mesos-net
 
 volumes:
   12345test:

docs/example/networkmode-user.yaml

@@ -9,6 +9,5 @@ services:
 
 networks:
   default:
-    external: true
-    name: mini
-    
+    name: mesos-net
+    driver: mesos-net

docs/example/test-extension.yaml

@@ -23,5 +23,6 @@ services:
 
 networks:
   default:
-    name: mini
-          
+    name: mesos-net
+    driver: mesos-net
+

docs/example/test-h2c.yaml

@@ -3,8 +3,7 @@ services:
   test1:
     image: docker.io/avhost/docker-lighttpd
     ports:
-      - "9999:8888/h2c"
-    network_mode: "bridge"    
+      - "31820:8888/h2c"
     labels:
       traefik.enable: "true"
       traefik.http.routers.test1.entrypoints: "web"
@@ -15,6 +14,6 @@ services:
 
 networks:
   default:
-    external: true
-    name: mini
-          
+    name: mesos-net
+    driver: mesos-net
+

mesos/mesos.go

@@ -93,6 +93,7 @@ func (e *Mesos) Revive() {
 
 // ForceSuppressFramework if all Tasks are running, suppress framework offers
 func (e *Mesos) ForceSuppressFramework() {
+  logrus.WithField("func", "mesos.ForceSuppressFramework").Info("Framework Suppress")
 	e.IsSuppress = false
 	e.SuppressFramework()
 }

scheduler/heartbeat.go

@@ -59,7 +59,7 @@ func (e *Scheduler) Heartbeat() {
 		}
 
 		// there are more instances are running as it should be
-		if e.Redis.CountRedisKey(task.TaskName+":*", "_KILL") > task.Instances {
+		if e.Redis.CountRedisKey(task.TaskName+":*", "__KILL") > task.Instances {
 			logrus.WithField("func", "scheduler.CheckState").Info("Scale down Mesos Task: ", task.TaskName)
 			e.Mesos.Revive()
 			task.State = "__KILL"

scheduler/scheduler.go

@@ -107,11 +107,9 @@ func (e *Scheduler) EventLoop() {
 			e.Framework.FrameworkInfo.Id = event.Subscribed.GetFrameworkId()
 			e.Framework.MesosStreamID = res.Header.Get("Mesos-Stream-Id")
 
-			if e.Config.ThreadEnable {
-				go e.reconcile()
-			} else {
-				e.reconcile()
-			}
+			e.reconcile()
+			e.Mesos.ForceSuppressFramework()
+
 			go e.Redis.SaveFrameworkRedis(e.Framework)
 			go e.Redis.SaveConfig(*e.Config)
 		case mesosproto.Event_UPDATE.Number():