gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

avoid data race on GoCDKPubSub.topic (#3596)

Browse source
This commit is contained in:
Konstantin Lebedev 2022-09-05 19:57:44 +05:00 committed by GitHub
parent 916673ae24
commit 9b2b7d4f5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
weed/notification/gocdk_pub_sub/gocdk_pub_sub.go
View file

@ -27,6 +27,7 @@ import (
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"net/url" "net/url"
"path" "path"
"sync"
"time" "time"
"github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/glog"
@ -51,31 +52,42 @@ func getPath(rawUrl string) string {
type GoCDKPubSub struct { type GoCDKPubSub struct {
topicURL string topicURL string
topic *pubsub.Topic topic *pubsub.Topic
topicLock sync.RWMutex
} }
func (k *GoCDKPubSub) GetName() string { func (k *GoCDKPubSub) GetName() string {
return "gocdk_pub_sub" return "gocdk_pub_sub"
} }
func (k *GoCDKPubSub) setTopic(topic *pubsub.Topic) {
k.topicLock.Lock()
k.topic = topic
k.topicLock.Unlock()
k.doReconnect()
}
func (k *GoCDKPubSub) doReconnect() { func (k *GoCDKPubSub) doReconnect() {
var conn *amqp.Connection var conn *amqp.Connection
k.topicLock.RLock()
defer k.topicLock.RUnlock()
if k.topic.As(&conn) { if k.topic.As(&conn) {
go func() { go func(c *amqp.Connection) {
<-conn.NotifyClose(make(chan *amqp.Error)) <-c.NotifyClose(make(chan *amqp.Error))
conn.Close() c.Close()
k.topicLock.RLock()
k.topic.Shutdown(context.Background()) k.topic.Shutdown(context.Background())
k.topicLock.RUnlock()
for { for {
glog.Info("Try reconnect") glog.Info("Try reconnect")
conn, err := amqp.Dial(os.Getenv("RABBIT_SERVER_URL")) conn, err := amqp.Dial(os.Getenv("RABBIT_SERVER_URL"))
if err == nil { if err == nil {
k.topic = rabbitpubsub.OpenTopic(conn, getPath(k.topicURL), nil) k.setTopic(rabbitpubsub.OpenTopic(conn, getPath(k.topicURL), nil))
k.doReconnect()
break break
} }
glog.Error(err) glog.Error(err)
time.Sleep(time.Second) time.Sleep(time.Second)
} }
}() }(conn)
} }
} }
@ -86,8 +98,7 @@ func (k *GoCDKPubSub) Initialize(configuration util.Configuration, prefix string
if err != nil { if err != nil {
glog.Fatalf("Failed to open topic: %v", err) glog.Fatalf("Failed to open topic: %v", err)
} }
k.topic = topic k.setTopic(topic)
k.doReconnect()
return nil return nil
} }
@ -96,6 +107,8 @@ func (k *GoCDKPubSub) SendMessage(key string, message proto.Message) error {
if err != nil { if err != nil {
return err return err
} }
k.topicLock.RLock()
defer k.topicLock.RUnlock()
err = k.topic.Send(context.Background(), &pubsub.Message{ err = k.topic.Send(context.Background(), &pubsub.Message{
Body: bytes, Body: bytes,
Metadata: map[string]string{"key": key}, Metadata: map[string]string{"key": key},