Merge bb4e7de into 6adf0fc

topfreegames · Jan 7, 2019 · 954535d · 954535d
2 parents 6adf0fc + bb4e7de
commit 954535d
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 18 deletions.
diff --git a/eventforwarder/forward.go b/eventforwarder/forward.go
@@ -112,7 +112,7 @@ func ForwardRoomEvent(
 					"roomId": room.ID,
 					"game":   cachedScheduler.Scheduler.Game,
 				}
-				if eventType != PingTimeoutEvent {
+				if eventType != PingTimeoutEvent && eventType != OccupiedTimeoutEvent {
 					infos, err = room.GetRoomInfos(db, kubernetesClient, schedulerCache, cachedScheduler.Scheduler, addrGetter)
 					metadata["ipv6Label"] = infos["ipv6Label"]
 
@@ -124,7 +124,7 @@ func ForwardRoomEvent(
 					reportIpv6Status(infos, logger)
 					delete(infos, "ipv6Label")
 
-				} else { // fill host and port with zero values when pingTimeout event so it won't break the GRPCForwarder
+				} else { // fill host and port with zero values when pingTimeout or occupiedTimeout event so it won't break the GRPCForwarder
 					infos["host"] = ""
 					infos["port"] = int32(0)
 				}

diff --git a/eventforwarder/forward_test.go b/eventforwarder/forward_test.go
@@ -67,7 +67,7 @@ var _ = Describe("Forward", func() {
 			Expect(response.Message).To(Equal("success"))
 		})
 
-		It("should forward pingTimeout room event", func() {
+		It("should forward pingTimeout and occupiedTimeout room events", func() {
 			ctx := context.Background()
 			mockEventForwarder.EXPECT().Forward(
 				ctx,
@@ -88,9 +88,9 @@ var _ = Describe("Forward", func() {
 				reportersConstants.TagHostname:  Hostname(),
 				reportersConstants.TagRoute:     RouteRoomEvent,
 				reportersConstants.TagStatus:    "success",
-			})
+			}).Times(2)
 
-			mockReporter.EXPECT().Report(reportersConstants.EventRPCDuration, gomock.Any())
+			mockReporter.EXPECT().Report(reportersConstants.EventRPCDuration, gomock.Any()).Times(2)
 
 			response, err := ForwardRoomEvent(
 				ctx,
@@ -109,6 +109,47 @@ var _ = Describe("Forward", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(response.Code).To(Equal(200))
 			Expect(response.Message).To(Equal("success"))
+
+			mockReporter.EXPECT().Report(reportersConstants.EventRPCStatus, map[string]interface{}{
+				reportersConstants.TagGame:      gameName,
+				reportersConstants.TagScheduler: schedulerName,
+				reportersConstants.TagHostname:  Hostname(),
+				reportersConstants.TagRoute:     RouteRoomEvent,
+				reportersConstants.TagStatus:    "success",
+			})
+
+			mockEventForwarder.EXPECT().Forward(
+				ctx,
+				models.StatusTerminated,
+				map[string]interface{}{
+					"host":     "",
+					"port":     int32(0),
+					"roomId":   roomName,
+					"game":     gameName,
+					"metadata": map[string]interface{}{},
+				},
+				metadata,
+			).Return(int32(200), "success", nil)
+
+			mockReporter.EXPECT().Report(reportersConstants.EventRPCDuration, gomock.Any())
+
+			response, err = ForwardRoomEvent(
+				ctx,
+				mockForwarders,
+				mockDB,
+				clientset,
+				room,
+				models.StatusTerminated,
+				OccupiedTimeoutEvent,
+				nil,
+				cache,
+				logger,
+				roomAddrGetter,
+			)
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(response.Code).To(Equal(200))
+			Expect(response.Message).To(Equal("success"))
 		})
 
 		It("should report fail if event forward fails", func() {

diff --git a/watcher/watcher_test.go b/watcher/watcher_test.go
@@ -695,18 +695,18 @@ var _ = Describe("Watcher", func() {
 					triggerMap[trigger.Type] = triggerSpec{
 						targetUsagePercent:          trigger.Usage,
 						pointsAboveThresholdPercent: pointsAbove,
-						limit:       trigger.Limit,
-						time:        trigger.Time,
-						triggerType: trigger.Type,
+						limit:                       trigger.Limit,
+						time:                        trigger.Time,
+						triggerType:                 trigger.Type,
 					}
 				}
 				if _, exists := triggerMap[trigger.Type]; !exists {
 					triggerMap[trigger.Type] = triggerSpec{
 						targetUsagePercent:          trigger.Usage,
 						pointsAboveThresholdPercent: pointsAbove,
-						limit:       trigger.Limit,
-						time:        trigger.Time,
-						triggerType: trigger.Type,
+						limit:                       trigger.Limit,
+						time:                        trigger.Time,
+						triggerType:                 trigger.Type,
 					}
 				}
 			}
@@ -721,18 +721,18 @@ var _ = Describe("Watcher", func() {
 					triggerMap[trigger.Type] = triggerSpec{
 						targetUsagePercent:          trigger.Usage,
 						pointsAboveThresholdPercent: 100 - pointsAbove,
-						limit:       trigger.Limit,
-						time:        trigger.Time,
-						triggerType: trigger.Type,
+						limit:                       trigger.Limit,
+						time:                        trigger.Time,
+						triggerType:                 trigger.Type,
 					}
 				}
 				if _, exists := triggerMap[trigger.Type]; !exists {
 					triggerMap[trigger.Type] = triggerSpec{
 						targetUsagePercent:          trigger.Usage,
 						pointsAboveThresholdPercent: 100 - pointsAbove,
-						limit:       trigger.Limit,
-						time:        trigger.Time,
-						triggerType: trigger.Type,
+						limit:                       trigger.Limit,
+						time:                        trigger.Time,
+						triggerType:                 trigger.Type,
 					}
 				}
 				down = append(down, triggerMap[trigger.Type])
@@ -3980,7 +3980,8 @@ var _ = Describe("Watcher", func() {
 					Expect(status).To(Equal(models.RoomTerminated))
 					Expect(infos["game"]).To(Equal(schedulerName))
 					Expect(expectedRooms).To(ContainElement(infos["roomId"]))
-				}).Times(len(expectedRooms))
+				}).Times(len(expectedRooms) * 2)
+
 			mockDb.EXPECT().Query(gomock.Any(), "SELECT * FROM schedulers WHERE name = ?", configYaml.Name).
 				Do(func(scheduler *models.Scheduler, query string, modifier string) {
 					scheduler.YAML = yaml1
@@ -4019,6 +4020,11 @@ var _ = Describe("Watcher", func() {
 				Expect(max).To(BeNumerically("~", ts, 1*time.Second))
 			}).Return(redis.NewStringSliceResult(expectedRooms, nil))
 
+			mockEventForwarder.EXPECT().Forward(gomock.Any(), models.RoomTerminated, gomock.Any(), gomock.Any()).Do(
+				func(ctx context.Context, status string, infos, fwdMetadata map[string]interface{}) {
+					Expect(status).To(Equal(models.RoomTerminated))
+				}).Times(len(expectedRooms))
+
 			mockDb.EXPECT().Query(gomock.Any(), "SELECT * FROM schedulers WHERE name = ?", configYaml.Name).
 				Do(func(scheduler *models.Scheduler, query string, modifier string) {
 					scheduler.YAML = yaml1