Skip to content

Agent Mesh

lock node subscrip

Antonio Ojeacc0d7b6e1c14
diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.go
index 85c1d6c8..00926ab2 100644
--- a/cmd/sam-node/node.go
+++ b/cmd/sam-node/node.go
@@ -746,28 +746,24 @@ func (n *SamNode) verifyEvent(event *api.MeshEvent) bool {
func (n *SamNode) subscribeToTopic(ctx context.Context, topicName string) error {
n.mu.Lock()
- _, ok := n.topics[topicName]
- var err error
- var topic *pubsub.Topic
- if !ok {
- topic, err = n.PubSub.Join(topicName)
- if err == nil {
- n.topics[topicName] = topic
- }
- } else {
- // Already joined and subscribed.
- n.mu.Unlock()
+ defer n.mu.Unlock()
+
+ if _, ok := n.topics[topicName]; ok {
return nil
}
- n.mu.Unlock()
+
+ topic, err := n.PubSub.Join(topicName)
if err != nil {
return err
}
+
sub, err := topic.Subscribe()
if err != nil {
return err
}
+ n.topics[topicName] = topic
+
bgCtx := context.Background()
go func() {
defer sub.Cancel()