fix(leaderredis): data race

DoNewsCode · Mar 16, 2022 · 65cba73 · 65cba73
1 parent 99ccd7a
commit 65cba73
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [1.18.0-beta2]
+        go-version: [1.18.x]
     runs-on: ubuntu-latest
     services:
       redis:

diff --git a/leader/example_cronjob_test.go b/leader/example_cronjob_test.go
@@ -3,11 +3,12 @@ package leader_test
 import (
 	"context"
 	"fmt"
+	"os"
+
 	"github.com/DoNewsCode/core"
 	"github.com/DoNewsCode/core/di"
 	"github.com/DoNewsCode/core/leader"
 	"github.com/DoNewsCode/core/otetcd"
-	"os"
 
 	"github.com/robfig/cron/v3"
 )

diff --git a/leader/leaderredis/redis.go b/leader/leaderredis/redis.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"sync"
 	"time"
 
 	"github.com/DoNewsCode/core/contract"
@@ -19,6 +20,7 @@ type RedisDriver struct {
 	expiration   time.Duration
 	pollInterval time.Duration
 	cancel       func()
+	lock         sync.Mutex
 	sha          string
 }
 
@@ -73,7 +75,9 @@ func (r *RedisDriver) Campaign(ctx context.Context, toLeader func(bool)) error {
 		// The node is elected as leader
 		toLeader(true)
 
+		r.lock.Lock()
 		ctx, r.cancel = context.WithCancel(ctx)
+		r.lock.Unlock()
 
 		for {
 			select {
@@ -90,9 +94,11 @@ func (r *RedisDriver) Campaign(ctx context.Context, toLeader func(bool)) error {
 
 // Resign gives up the leadership using redis. If the current node is not a leader, this is an no op.
 func (r *RedisDriver) Resign(ctx context.Context) error {
+	r.lock.Lock()
 	if r.cancel != nil {
 		r.cancel()
 	}
+	r.lock.Unlock()
 	hostname, _ := os.Hostname()
 	if r.sha == "" {
 		var err error