feat(redislock): support set context (#2208)

* feat(redislock): support set context

* chore: fix test

core/stores/redis/redislock.go

@@ -1,12 +1,14 @@
 package redis
 
 import (
+	"context"
 	"math/rand"
 	"strconv"
 	"sync/atomic"
 	"time"
 
 	red "github.com/go-redis/redis/v8"
+
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/stringx"
 )
@@ -34,6 +36,7 @@ type RedisLock struct {
 	seconds uint32
 	key     string
 	id      string
+	ctx     context.Context
 }
 
 func init() {
@@ -51,8 +54,9 @@ func NewRedisLock(store *Redis, key string) *RedisLock {
 
 // Acquire acquires the lock.
 func (rl *RedisLock) Acquire() (bool, error) {
+	rl.fillCtx()
 	seconds := atomic.LoadUint32(&rl.seconds)
-	resp, err := rl.store.Eval(lockCommand, []string{rl.key}, []string{
+	resp, err := rl.store.EvalCtx(rl.ctx, lockCommand, []string{rl.key}, []string{
 		rl.id, strconv.Itoa(int(seconds)*millisPerSecond + tolerance),
 	})
 	if err == red.Nil {
@@ -75,7 +79,8 @@ func (rl *RedisLock) Acquire() (bool, error) {
 
 // Release releases the lock.
 func (rl *RedisLock) Release() (bool, error) {
-	resp, err := rl.store.Eval(delCommand, []string{rl.key}, []string{rl.id})
+	rl.fillCtx()
+	resp, err := rl.store.EvalCtx(rl.ctx, delCommand, []string{rl.key}, []string{rl.id})
 	if err != nil {
 		return false, err
 	}
@@ -92,3 +97,14 @@ func (rl *RedisLock) Release() (bool, error) {
 func (rl *RedisLock) SetExpire(seconds int) {
 	atomic.StoreUint32(&rl.seconds, uint32(seconds))
 }
+
+// WithContext set context.
+func (rl *RedisLock) WithContext(ctx context.Context) {
+	rl.ctx = ctx
+}
+
+func (rl *RedisLock) fillCtx() {
+	if rl.ctx == nil {
+		rl.ctx = context.Background()
+	}
+}

core/stores/redis/redislock_test.go

@@ -1,33 +1,51 @@
 package redis
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"github.com/zeromicro/go-zero/core/stringx"
 )
 
 func TestRedisLock(t *testing.T) {
-	runOnRedis(t, func(client *Redis) {
+	testFn := func(ctx context.Context) func(client *Redis) {
-		key := stringx.Rand()
+		return func(client *Redis) {
-		firstLock := NewRedisLock(client, key)
+			key := stringx.Rand()
-		firstLock.SetExpire(5)
+			firstLock := NewRedisLock(client, key)
-		firstAcquire, err := firstLock.Acquire()
+			if ctx != nil {
-		assert.Nil(t, err)
+				firstLock.WithContext(ctx)
-		assert.True(t, firstAcquire)
+			}
-
+			firstLock.SetExpire(5)
-		secondLock := NewRedisLock(client, key)
+			firstAcquire, err := firstLock.Acquire()
-		secondLock.SetExpire(5)
+			assert.Nil(t, err)
-		againAcquire, err := secondLock.Acquire()
+			assert.True(t, firstAcquire)
-		assert.Nil(t, err)
+
-		assert.False(t, againAcquire)
+			secondLock := NewRedisLock(client, key)
-
+			if ctx != nil {
-		release, err := firstLock.Release()
+				secondLock.WithContext(ctx)
-		assert.Nil(t, err)
+			}
-		assert.True(t, release)
+			secondLock.SetExpire(5)
-
+			againAcquire, err := secondLock.Acquire()
-		endAcquire, err := secondLock.Acquire()
+			assert.Nil(t, err)
-		assert.Nil(t, err)
+			assert.False(t, againAcquire)
-		assert.True(t, endAcquire)
+
+			release, err := firstLock.Release()
+			assert.Nil(t, err)
+			assert.True(t, release)
+
+			endAcquire, err := secondLock.Acquire()
+			assert.Nil(t, err)
+			assert.True(t, endAcquire)
+		}
+	}
+
+	t.Run("normal", func(t *testing.T) {
+		runOnRedis(t, testFn(nil))
+	})
+
+	t.Run("withContext", func(t *testing.T) {
+		runOnRedis(t, testFn(context.Background()))
 	})
 }