save room metadata and send on timeout forwards

topfreegames · Apr 12, 2019 · ade6512 · ade6512
1 parent 716ec1e
commit ade6512
Show file tree

Hide file tree

Showing 15 changed files with 401 additions and 171 deletions.
diff --git a/api/room_handler.go b/api/room_handler.go
@@ -56,7 +56,7 @@ func (g *RoomPingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		g.App.DBClient.WithContext(r.Context()),
 		mr,
 		g.App.KubernetesClient,
-		payload.Status,
+		payload,
 		g.App.Config,
 		room,
 		g.App.SchedulerCache,
@@ -251,7 +251,7 @@ func (g *RoomStatusHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		g.App.DBClient.WithContext(r.Context()),
 		mr,
 		g.App.KubernetesClient,
-		payload.Status,
+		payload,
 		g.App.Config,
 		room,
 		g.App.SchedulerCache,

diff --git a/api/room_handler_test.go b/api/room_handler_test.go
@@ -125,6 +125,7 @@ forwarders:
 				mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 					"lastPing": time.Now().Unix(),
 					"status":   status,
+					"metadata": "",
 				})
 				mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 				mockPipeline.EXPECT().ZRem(lKey, roomName)
@@ -157,6 +158,7 @@ forwarders:
 				mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 					"lastPing": time.Now().Unix(),
 					"status":   status,
+					"metadata": "",
 				}).Times(2)
 				mockPipeline.EXPECT().ZAdd(pKey, gomock.Any()).Times(2)
 				mockPipeline.EXPECT().ZRem(lKey, roomName).Times(2)
@@ -288,6 +290,7 @@ forwarders:
 				mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 					"lastPing": time.Now().Unix(),
 					"status":   status,
+					"metadata": "",
 				})
 				mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 				mockPipeline.EXPECT().ZRem(lKey, roomName)
@@ -324,6 +327,7 @@ forwarders:
 				mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 					"lastPing": time.Now().Unix(),
 					"status":   status,
+					"metadata": "",
 				})
 				mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 				mockPipeline.EXPECT().ZRem(lKey, roomName)
@@ -386,6 +390,7 @@ forwarders:
 				mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 					"lastPing": time.Now().Unix(),
 					"status":   status,
+					"metadata": "",
 				})
 				mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 				mockPipeline.EXPECT().ZRem(lKey, roomName)
@@ -521,6 +526,7 @@ forwarders:
 					mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 						"lastPing": time.Now().Unix(),
 						"status":   status,
+						"metadata": "",
 					})
 					mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 					mockPipeline.EXPECT().ZRem(lKey, roomName)
@@ -558,6 +564,7 @@ forwarders:
 					mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 						"lastPing": time.Now().Unix(),
 						"status":   status,
+						"metadata": `{"ipv6Label":"","type":"sometype"}`,
 					})
 					mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 					mockPipeline.EXPECT().ZRem(lKey, roomName)
@@ -616,6 +623,7 @@ forwarders:
 				mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 					"lastPing": time.Now().Unix(),
 					"status":   status,
+					"metadata": "",
 				})
 				mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 				mockPipeline.EXPECT().ZRem(lKey, roomName)

diff --git a/config/local.yaml b/config/local.yaml
@@ -39,7 +39,7 @@ reporters:
     region: "region"
   http:
     timeout: "5s"
-    putURL: "localhost:8080"
+    putURL: "http://localhost:8080"
     region: "region"
 scaleUpTimeoutSeconds: 600
 scaleDownTimeoutSeconds: 600

diff --git a/config/test.yaml b/config/test.yaml
@@ -29,7 +29,7 @@ reporters:
     region: "test"
   http:
     timeout: "5s"
-    putURL: "localhost:8080"
+    putURL: "http://localhost:8080"
     region: "test"
 scaleUpTimeoutSeconds: 300
 scaleDownTimeoutSeconds: 300

diff --git a/controller/controller.go b/controller/controller.go
@@ -1200,7 +1200,7 @@ func SetRoomStatus(
 	db pginterfaces.DB,
 	mr *models.MixedMetricsReporter,
 	clientset kubernetes.Interface,
-	status string,
+	roomPayload *models.RoomStatusPayload,
 	config *viper.Viper,
 	room *models.Room,
 	schedulerCache *models.SchedulerCache,
@@ -1214,18 +1214,13 @@ func SetRoomStatus(
 		return err
 	}
 	roomsCountByStatus, err := room.SetStatus(
-		redisClient,
-		db,
-		mr,
-		status,
-		cachedScheduler.Scheduler,
-		status == models.StatusOccupied,
-	)
+		redisClient, db, mr,
+		roomPayload, cachedScheduler.Scheduler)
 	if err != nil {
 		return err
 	}
 
-	if status != models.StatusOccupied {
+	if roomPayload.Status != models.StatusOccupied {
 		return nil
 	}
 

diff --git a/controller/controller_test.go b/controller/controller_test.go
@@ -6352,6 +6352,7 @@ containers:
 			mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 				"lastPing": time.Now().Unix(),
 				"status":   status,
+				"metadata": "",
 			})
 			mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 			mockPipeline.EXPECT().ZRem(lKey, roomName)
@@ -6370,7 +6371,7 @@ containers:
 				mockDb,
 				mr,
 				clientset,
-				status,
+				&models.RoomStatusPayload{Status: status},
 				config,
 				room,
 				schedulerCache,
@@ -6389,6 +6390,7 @@ containers:
 			mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 				"lastPing": time.Now().Unix(),
 				"status":   status,
+				"metadata": "",
 			})
 			mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 			mockPipeline.EXPECT().Eval(models.ZaddIfNotExists, gomock.Any(), roomName)
@@ -6465,7 +6467,7 @@ containers:
 				mockDb,
 				mr,
 				clientset,
-				status,
+				&models.RoomStatusPayload{Status: status},
 				config,
 				room,
 				schedulerCache,
@@ -6486,6 +6488,7 @@ containers:
 			mockPipeline.EXPECT().HMSet(rKey, map[string]interface{}{
 				"lastPing": time.Now().Unix(),
 				"status":   status,
+				"metadata": "",
 			})
 			mockPipeline.EXPECT().ZAdd(pKey, gomock.Any())
 			mockPipeline.EXPECT().Eval(models.ZaddIfNotExists, gomock.Any(), roomName)
@@ -6520,7 +6523,7 @@ containers:
 				mockDb,
 				mr,
 				clientset,
-				status,
+				&models.RoomStatusPayload{Status: status},
 				config,
 				room,
 				schedulerCache,
@@ -6544,7 +6547,7 @@ containers:
 				mockDb,
 				mr,
 				clientset,
-				status,
+				&models.RoomStatusPayload{Status: status},
 				config,
 				room,
 				schedulerCache,

diff --git a/dev-room/app.py b/dev-room/app.py
@@ -1,5 +1,4 @@
 # External deps
-import sys
 import signal
 import time
 import requests
@@ -8,32 +7,51 @@
 import threading
 from logging.config import fileConfig
 
-# Internal deps 
+# Internal deps
 import constant
-from api import Healthcheck, Address, Status, IncreaseCPUUsage, IncreaseMemUsage
+from api import (
+    Healthcheck, Address, Status,
+    IncreaseCPUUsage, IncreaseMemUsage
+)
 
 fileConfig('logging_config.ini')
 logger = logging.getLogger()
 
 status = "ready"
 
+
 def sigterm_handler(signal, frame):
     global status
     print('Terminating room')
     status = "terminating"
-    requests.put("{}/{}".format(constant.MAESTRO_ADDR, constant.ROOM_PING_ENDPOINT), json={"timestamp": int(time.time()), "status": status})
+    requests.put("{}/{}".format(
+        constant.MAESTRO_ADDR,
+        constant.ROOM_PING_ENDPOINT,
+    ), json={"timestamp": int(time.time()), "status": status})
     exit()
 
+
 signal.signal(signal.SIGTERM, sigterm_handler)
 signal.signal(signal.SIGINT, sigterm_handler)
 
 
 def ping():
     while True:
         try:
-            print("ping {}/{}".format(constant.MAESTRO_ADDR, constant.ROOM_PING_ENDPOINT))
+            print("ping {}/{}".format(
+                constant.MAESTRO_ADDR,
+                constant.ROOM_PING_ENDPOINT))
             print("status {}".format(status))
-            requests.put("{}/{}".format(constant.MAESTRO_ADDR, constant.ROOM_PING_ENDPOINT), json={"timestamp": int(time.time()), "status": status})
+            requests.put("{}/{}".format(
+                constant.MAESTRO_ADDR,
+                constant.ROOM_PING_ENDPOINT,
+            ), json={
+                "timestamp": int(time.time()),
+                "status": status,
+                "metadata": {
+                    "region": "us"
+                }
+            })
         except Exception as ex:
             print(str(ex))
             pass
@@ -42,10 +60,21 @@ def ping():
 
 while True:
     try:
-        print("polling {}/{}".format(constant.MAESTRO_ADDR, constant.ROOM_ADDR_ENDPOINT))
-        r = requests.get("{}/{}".format(constant.MAESTRO_ADDR, constant.ROOM_ADDR_ENDPOINT))
+        print("polling {}/{}".format(
+            constant.MAESTRO_ADDR,
+            constant.ROOM_ADDR_ENDPOINT))
+
+        r = requests.get("{}/{}".format(
+            constant.MAESTRO_ADDR,
+            constant.ROOM_ADDR_ENDPOINT))
         if r.status_code == 200:
-            r = requests.put("{}/{}".format(constant.MAESTRO_ADDR, constant.ROOM_STATUS_ENDPOINT), json={"timestamp": int(time.time()), "status": "ready"})
+            r = requests.put("{}/{}".format(
+                constant.MAESTRO_ADDR,
+                constant.ROOM_STATUS_ENDPOINT,
+            ), json={
+                "timestamp": int(time.time()),
+                "status": "ready",
+            })
             break
     except Exception as ex:
         print(str(ex))
@@ -60,4 +89,4 @@ def ping():
 app.add_route('/address', Address())
 app.add_route('/status', Status())
 app.add_route('/increase_cpu', IncreaseCPUUsage())
-app.add_route('/increase_mem', IncreaseMemUsage())
+app.add_route('/increase_mem', IncreaseMemUsage())
diff --git a/manifests/maestro-boomforce-game.yaml b/manifests/maestro-boomforce-game.yaml
diff --git a/manifests/scheduler-config-5.json b/manifests/scheduler-config-5.json
@@ -16,7 +16,7 @@
    },
    "shutdownTimeout": 10,
    "autoscaling": {
-      "min": 4,
+      "min": 1,
       "up": {
          "delta": 1,
          "trigger": {