Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/rolling update #66

Merged
merged 8 commits into from
Aug 9, 2019
Merged

Feature/rolling update #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b2200ed
Create rooms before deleting old ones
Aug 6, 2019
d9935fa
Remove unnecessary comments
Aug 6, 2019
fee3c42
Fix rolling-update flow
Aug 7, 2019
0f68d5c
Create pod and delete old one after in each chunk
Aug 7, 2019
2b1a9b4
Remove waitCreatingAndDeleteOldPods
Aug 7, 2019
1cfa8f9
Log error if not able to get pod in waitTerminatingPods and waitCreat…
Aug 7, 2019
cbb059e
WIP: Use goroutines to perform rolling update
Aug 7, 2019
8cce3e0
Use goroutines to perform rolling update
Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions api/scheduler_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ var _ = Describe("Scheduler Handler", func() {
},
"shutdownTimeout": 180,
"autoscaling": {
"min": 100,
"min": 10,
"up": {
"delta": 10,
"trigger": {
Expand Down Expand Up @@ -293,7 +293,7 @@ var _ = Describe("Scheduler Handler", func() {

app.Router.ServeHTTP(recorder, request)
Expect(recorder.Code).To(Equal(http.StatusOK))
Expect(recorder.Body.String()).To(Equal(`[{"autoscalingDownTriggerUsage":50,"autoscalingMin":100,"autoscalingUpTriggerUsage":70,"game":"game-name","name":"scheduler1","roomsCreating":2,"roomsOccupied":1,"roomsReady":1,"roomsTerminating":0,"state":"in-sync"}]`))
Expect(recorder.Body.String()).To(Equal(`[{"autoscalingDownTriggerUsage":50,"autoscalingMin":10,"autoscalingUpTriggerUsage":70,"game":"game-name","name":"scheduler1","roomsCreating":2,"roomsOccupied":1,"roomsReady":1,"roomsTerminating":0,"state":"in-sync"}]`))
})

It("should list empty array when there aren't schedulers", func() {
Expand All @@ -318,23 +318,23 @@ var _ = Describe("Scheduler Handler", func() {
Context("when all services are healthy", func() {
It("returns a status code of 201 and success body", func() {
mockRedisTraceWrapper.EXPECT().WithContext(gomock.Any(), mockRedisClient).Return(mockRedisClient)
mockRedisClient.EXPECT().TxPipeline().Return(mockPipeline).Times(100)
mockRedisClient.EXPECT().TxPipeline().Return(mockPipeline).Times(10)
mockPipeline.EXPECT().HMSet(gomock.Any(), gomock.Any()).Do(
func(schedulerName string, statusInfo map[string]interface{}) {
Expect(statusInfo["status"]).To(Equal(models.StatusCreating))
Expect(statusInfo["lastPing"]).To(BeNumerically("~", time.Now().Unix(), 1))
},
).Times(100)
mockPipeline.EXPECT().ZAdd(models.GetRoomPingRedisKey("scheduler-name"), gomock.Any()).Times(100)
mockPipeline.EXPECT().SAdd(models.GetRoomStatusSetRedisKey("scheduler-name", "creating"), gomock.Any()).Times(100)
mockPipeline.EXPECT().Exec().Times(100)
).Times(10)
mockPipeline.EXPECT().ZAdd(models.GetRoomPingRedisKey("scheduler-name"), gomock.Any()).Times(10)
mockPipeline.EXPECT().SAdd(models.GetRoomStatusSetRedisKey("scheduler-name", "creating"), gomock.Any()).Times(10)
mockPipeline.EXPECT().Exec().Times(10)
MockInsertScheduler(mockDb, nil)
MockUpdateScheduler(mockDb, nil, nil)

mockRedisClient.EXPECT().
Get(models.GlobalPortsPoolKey).
Return(goredis.NewStringResult(workerPortRange, nil)).
Times(100)
Times(10)

var configYaml1 models.ConfigYAML
err := yaml.Unmarshal([]byte(yamlString), &configYaml1)
Expand Down Expand Up @@ -564,16 +564,16 @@ autoscaling:

It("forwards scheduler event", func() {
mockRedisTraceWrapper.EXPECT().WithContext(gomock.Any(), mockRedisClient).Return(mockRedisClient)
mockRedisClient.EXPECT().TxPipeline().Return(mockPipeline).Times(100)
mockRedisClient.EXPECT().TxPipeline().Return(mockPipeline).Times(10)
mockPipeline.EXPECT().HMSet(gomock.Any(), gomock.Any()).Do(
func(schedulerName string, statusInfo map[string]interface{}) {
Expect(statusInfo["status"]).To(Equal(models.StatusCreating))
Expect(statusInfo["lastPing"]).To(BeNumerically("~", time.Now().Unix(), 1))
},
).Times(100)
mockPipeline.EXPECT().ZAdd(models.GetRoomPingRedisKey("scheduler-name"), gomock.Any()).Times(100)
mockPipeline.EXPECT().SAdd(models.GetRoomStatusSetRedisKey("scheduler-name", "creating"), gomock.Any()).Times(100)
mockPipeline.EXPECT().Exec().Times(100)
).Times(10)
mockPipeline.EXPECT().ZAdd(models.GetRoomPingRedisKey("scheduler-name"), gomock.Any()).Times(10)
mockPipeline.EXPECT().SAdd(models.GetRoomStatusSetRedisKey("scheduler-name", "creating"), gomock.Any()).Times(10)
mockPipeline.EXPECT().Exec().Times(10)

mockDb.EXPECT().Query(
gomock.Any(),
Expand All @@ -589,7 +589,7 @@ autoscaling:
MockInsertScheduler(mockDb, nil)
MockUpdateScheduler(mockDb, nil, nil)
mockRedisClient.EXPECT().Get(models.GlobalPortsPoolKey).
Return(goredis.NewStringResult(workerPortRange, nil)).Times(100)
Return(goredis.NewStringResult(workerPortRange, nil)).Times(10)

var configYaml1 models.ConfigYAML
err := yaml.Unmarshal([]byte(yamlString), &configYaml1)
Expand Down Expand Up @@ -699,7 +699,7 @@ autoscaling:
},
"shutdownTimeout": 180,
"autoscaling": {
"min": 100,
"min": 10,
"up": {
"delta": 10,
"trigger": {
Expand Down Expand Up @@ -779,8 +779,8 @@ autoscaling:

// Create new roome
// It will use the same number of rooms as config1, and ScaleUp to new min in Watcher at AutoScale
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd)
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml, 0)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd, 0)

// Update new config on schedulers table
MockUpdateSchedulersTable(mockDb, nil)
Expand Down Expand Up @@ -1111,8 +1111,8 @@ autoscaling:

// Create new roome
// It will use the same number of rooms as config1, and ScaleUp to new min in Watcher at AutoScale
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd)
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml, 0)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd, 0)

// Update new config on schedulers table
MockUpdateSchedulersTable(mockDb, nil)
Expand Down Expand Up @@ -1202,8 +1202,8 @@ autoscaling:

// Create new roome
// It will use the same number of rooms as config1, and ScaleUp to new min in Watcher at AutoScale
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd)
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml, 0)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd, 0)

// Update new config on schedulers table
MockUpdateSchedulersTable(mockDb, errors.New("err on db"))
Expand Down Expand Up @@ -2381,8 +2381,8 @@ game: game-name

// Create new roome
// It will use the same number of rooms as config1, and ScaleUp to new min in Watcher at AutoScale
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd)
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml, 0)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd, 0)

// Update new config on schedulers table
MockUpdateSchedulersTable(mockDb, nil)
Expand Down Expand Up @@ -2439,8 +2439,8 @@ game: game-name

// Create new roome
// It will use the same number of rooms as config1, and ScaleUp to new min in Watcher at AutoScale
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd)
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml, 0)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd, 0)

// Update new config on schedulers table
MockUpdateSchedulersTable(mockDb, nil)
Expand Down Expand Up @@ -2780,8 +2780,8 @@ game: game-name

// Create new roome
// It will use the same number of rooms as config1, and ScaleUp to new min in Watcher at AutoScale
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd)
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml, 0)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd, 0)

// Update new config on schedulers table
MockUpdateSchedulersTable(mockDb, nil)
Expand Down Expand Up @@ -2873,7 +2873,7 @@ game: game-name

// Create new roome
// It will use the same number of rooms as config1, and ScaleUp to new min in Watcher at AutoScale
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml1)
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml1, 0)

// Update new config on schedulers table
MockUpdateSchedulersTable(mockDb, nil)
Expand Down Expand Up @@ -2954,8 +2954,8 @@ game: game-name

// Create new roome
// It will use the same number of rooms as config1, and ScaleUp to new min in Watcher at AutoScale
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd)
MockCreateRooms(mockRedisClient, mockPipeline, &configYaml, 0)
MockGetPortsFromPool(&configYaml, mockRedisClient, nil, workerPortRange, portStart, portEnd, 0)

// Update new config on schedulers table
MockUpdateSchedulersTable(mockDb, nil)
Expand Down
2 changes: 1 addition & 1 deletion controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ waitForLock:
deletedPods := []v1.Pod{}

for i, chunk := range podChunks {
l.Debugf("deleting chunk %d: %v", i, names(chunk))
l.Debugf("updating chunk %d: %v", i, names(chunk))

newlyCreatedPods, newlyDeletedPods, timedout, canceled := replacePodsAndWait(
l, roomManager, mr, clientset, db, redisClient.Client,
Expand Down
Loading