wrap time.Sleep in select

pingcap · Oct 19, 2020 · a4459f2 · a4459f2
1 parent 57113da
commit a4459f2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lightning/backend/local.go b/lightning/backend/local.go
@@ -1220,7 +1220,11 @@ func (local *local) isIngestRetryable(
 			}
 			log.L().Warn("get region by key return nil, will retry", zap.Reflect("region", region),
 				zap.Int("retry", i))
-			time.Sleep(time.Second)
+			select {
+			case <-ctx.Done():
+				return nil, ctx.Err()
+			case <-time.After(time.Second):
+			}
 		}
 	}
 

diff --git a/lightning/backend/local_test.go b/lightning/backend/local_test.go
@@ -14,9 +14,9 @@ func (s *localSuite) TestNextKey(c *C) {
 	c.Assert(nextKey([]byte{}), DeepEquals, []byte{})
 
 	cases := [][]byte{
-		[]byte{0},
-		[]byte{255},
-		[]byte{1, 255},
+		{0},
+		{255},
+		{1, 255},
 	}
 	for _, b := range cases {
 		next := nextKey(b)