Skip to content

Commit

Permalink
topom: limit the timeout of nonblocking migration to 5s
Browse files Browse the repository at this point in the history
  • Loading branch information
spinlock committed May 22, 2017
1 parent 78b2c3a commit fcc814f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkg/topom/topom_slots.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ package topom

import (
"sort"
"time"

rbtree "github.com/emirpasic/gods/trees/redblacktree"

"github.com/CodisLabs/codis/pkg/models"
"github.com/CodisLabs/codis/pkg/utils/errors"
"github.com/CodisLabs/codis/pkg/utils/log"
"github.com/CodisLabs/codis/pkg/utils/math2"
"github.com/CodisLabs/codis/pkg/utils/redis"
)

Expand Down Expand Up @@ -412,7 +414,8 @@ func (s *Topom) newSlotActionExecutor(sid int) (func(db int) (remains int, nextd
MaxBulks: s.config.MigrationAsyncMaxBulks,
MaxBytes: s.config.MigrationAsyncMaxBytes.AsInt(),
NumKeys: s.config.MigrationAsyncNumKeys,
Timeout: s.config.MigrationTimeout.Duration(),
Timeout: math2.MinDuration(time.Second*5,
s.config.MigrationTimeout.Duration()),
}
do = func() (int, error) {
return c.MigrateSlotAsync(sid, dest, option)
Expand Down

0 comments on commit fcc814f

Please sign in to comment.