Skip to content

fix:修复启动时重复注册topic的问题 / use sync once to provent join topic repeatly #5608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simlecode merged 1 commit into from
Dec 22, 2022
Merged

fix:修复启动时重复注册topic的问题 / use sync once to provent join topic repeatly #5608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions app/submodule/mpool/mpool_submodule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"os"
"strconv"
"sync"
"time"

pubsub "github.com/libp2p/go-libp2p-pubsub"
Expand Down Expand Up @@ -51,8 +52,7 @@ type messagepoolConfig interface {
// MessagingSubmodule enhances the `Node` with internal message capabilities.
type MessagePoolSubmodule struct { //nolint
// Network Fields
MessageTopic *pubsub.Topic
MessageSub *pubsub.Subscription
MessageSub *pubsub.Subscription

MPool *messagepool.MessagePool
msgSigner *messagepool.MessageSigner
Expand Down Expand Up @@ -182,15 +182,20 @@ func (mp *MessagePoolSubmodule) Start(ctx context.Context) error {
return err
}

msgTopic, err := mp.network.Pubsub.Join(topicName)
if err != nil {
return err
}

var once sync.Once
subscribe := func() {
var err error
if mp.MessageTopic, err = mp.network.Pubsub.Join(topicName); err != nil {
panic(err)
}
if mp.MessageSub, err = mp.MessageTopic.Subscribe(); err != nil {
panic(err)
}
go mp.handleIncomingMessage(ctx)
once.Do(func() {
var err error
if mp.MessageSub, err = msgTopic.Subscribe(); err != nil {
panic(err)
}
go mp.handleIncomingMessage(ctx)
})
}

// wait until we are synced within 10 epochs
Expand Down