Resolve concurrent map issue

yorkie-team · May 23, 2023 · f8a1576 · f8a1576
1 parent dbcec29
commit f8a1576
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/server/backend/sync/memory/coordinator.go b/server/backend/sync/memory/coordinator.go
@@ -65,10 +65,7 @@ func (c *Coordinator) Subscribe(
 		return nil, nil, err
 	}
 
-	var peers []types.Client
-	for _, sub := range c.pubSub.subscriptionsMapByDocID[documentID].Map() {
-		peers = append(peers, sub.Subscriber())
-	}
+	peers := c.pubSub.GetPeers(documentID)
 	return sub, peers, nil
 }
 

diff --git a/server/backend/sync/memory/pubsub.go b/server/backend/sync/memory/pubsub.go
@@ -201,6 +201,18 @@ func (m *PubSub) Publish(
 	}
 }
 
+// GetPeers returns the peers of the given document.
+func (m *PubSub) GetPeers(documentID types.ID) []types.Client {
+	m.subscriptionsMapMu.RLock()
+	defer m.subscriptionsMapMu.RUnlock()
+
+	var peers []types.Client
+	for _, sub := range m.subscriptionsMapByDocID[documentID].Map() {
+		peers = append(peers, sub.Subscriber())
+	}
+	return peers
+}
+
 // UpdatePresence updates the presence of the given client.
 func (m *PubSub) UpdatePresence(
 	publisher *types.Client,