logos-messaging/logos-messaging-go
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-go.git synced 2026-01-05 23:43:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: draft changes enabling auto sharding in all clusters

Browse Source
This commit is contained in:
Prem Chaitanya Prathi 2024-03-20 12:22:10 +05:30
parent 7d767c0105
commit bfd47a8d36
No known key found for this signature in database
9 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/waku/node.go
View File

@ -455,7 +455,7 @@ func processTopics(options NodeOptions) (map[string][]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
pTopic := wprotocol.GetShardFromContentTopic(contentTopic, wprotocol.GenerationZeroShardsCount) pTopic := wprotocol.GetShardFromContentTopic(contentTopic, uint16(options.ClusterID), wprotocol.GenerationZeroShardsCount)
if _, ok := pubSubTopicMap[pTopic.String()]; !ok { if _, ok := pubSubTopicMap[pTopic.String()]; !ok {
pubSubTopicMap[pTopic.String()] = []string{} pubSubTopicMap[pTopic.String()] = []string{}
} }

6
cmd/waku/server/rest/filter.go
View File

@ -34,7 +34,7 @@ type FilterService struct {
func (s *FilterService) Start(ctx context.Context) { func (s *FilterService) Start(ctx context.Context) {
for _, sub := range s.node.FilterLightnode().Subscriptions() { for _, sub := range s.node.FilterLightnode().Subscriptions() {
s.cache.subscribe(sub.ContentFilter) s.cache.subscribe(s.node.ClusterID(), sub.ContentFilter)
} }
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
@ -190,7 +190,7 @@ func (s *FilterService) subscribe(w http.ResponseWriter, req *http.Request) {
} }
// on success // on success
s.cache.subscribe(contentFilter) s.cache.subscribe(s.node.ClusterID(), contentFilter)
writeResponse(w, filterSubscriptionResponse{ writeResponse(w, filterSubscriptionResponse{
RequestID: message.RequestID, RequestID: message.RequestID,
StatusDesc: http.StatusText(http.StatusOK), StatusDesc: http.StatusText(http.StatusOK),
@ -346,7 +346,7 @@ func (s *FilterService) getMessagesByContentTopic(w http.ResponseWriter, req *ht
if contentTopic == "" { if contentTopic == "" {
return return
} }
pubsubTopic, err := protocol.GetPubSubTopicFromContentTopic(contentTopic) pubsubTopic, err := protocol.GetPubSubTopicFromContentTopic(s.node.ClusterID(), contentTopic)
if err != nil { if err != nil {
writeGetMessageErr(w, fmt.Errorf("bad content topic"), http.StatusBadRequest, s.log) writeGetMessageErr(w, fmt.Errorf("bad content topic"), http.StatusBadRequest, s.log)
return return

4
cmd/waku/server/rest/filter_cache.go
View File

@ -23,11 +23,11 @@ func newFilterCache(capacity int, log *zap.Logger) *filterCache {
} }
} }
func (c *filterCache) subscribe(contentFilter protocol.ContentFilter) { func (c *filterCache) subscribe(clusterID uint16, contentFilter protocol.ContentFilter) {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
pubSubTopicMap, _ := protocol.ContentFilterToPubSubTopicMap(contentFilter) pubSubTopicMap, _ := protocol.ContentFilterToPubSubTopicMap(clusterID, contentFilter)
for pubsubTopic, contentTopics := range pubSubTopicMap { for pubsubTopic, contentTopics := range pubSubTopicMap {
if c.data[pubsubTopic] == nil { if c.data[pubsubTopic] == nil {
c.data[pubsubTopic] = make(map[string][]*RestWakuMessage) c.data[pubsubTopic] = make(map[string][]*RestWakuMessage)

4
cmd/waku/server/rest/filter_test.go
View File

@ -261,7 +261,7 @@ func TestFilterGetMessages(t *testing.T) {
contentTopic := "/waku/2/app/1" contentTopic := "/waku/2/app/1"
// get nodes add connect them // get nodes add connect them
generatedPubsubTopic, err := protocol.GetPubSubTopicFromContentTopic(contentTopic) generatedPubsubTopic, err := protocol.GetPubSubTopicFromContentTopic(protocol.DefaultClusterIndex, contentTopic)
require.NoError(t, err) require.NoError(t, err)
node1, node2 := twoFilterConnectedNodes(t, pubsubTopic, generatedPubsubTopic) node1, node2 := twoFilterConnectedNodes(t, pubsubTopic, generatedPubsubTopic)
defer func() { defer func() {
@ -378,7 +378,7 @@ func toMessage(envs []*protocol.Envelope) []*pb.WakuMessage {
func genMessage(pubsubTopic, contentTopic string) *protocol.Envelope { func genMessage(pubsubTopic, contentTopic string) *protocol.Envelope {
if pubsubTopic == "" { if pubsubTopic == "" {
pubsubTopic, _ = protocol.GetPubSubTopicFromContentTopic(contentTopic) pubsubTopic, _ = protocol.GetPubSubTopicFromContentTopic(protocol.DefaultClusterIndex, contentTopic)
} }
return protocol.NewEnvelope( return protocol.NewEnvelope(
&pb.WakuMessage{ &pb.WakuMessage{

2
waku/v2/node/wakunode2.go
View File

@ -846,7 +846,7 @@ func (w *WakuNode) PeersByStaticShard(cluster uint16, shard uint16) peer.IDSlice
// PeersByContentTopics filters peers based on contentTopic // PeersByContentTopics filters peers based on contentTopic
func (w *WakuNode) PeersByContentTopic(contentTopic string) peer.IDSlice { func (w *WakuNode) PeersByContentTopic(contentTopic string) peer.IDSlice {
pTopic, err := wakuprotocol.GetPubSubTopicFromContentTopic(contentTopic) pTopic, err := wakuprotocol.GetPubSubTopicFromContentTopic(w.ClusterID(), contentTopic)
if err != nil { if err != nil {
return nil return nil
} }

8
waku/v2/peermanager/peer_selection.go
View File

@ -24,8 +24,14 @@ type peerSet map[peer.ID]struct{}
// If a peer cannot be found in the service slot, a peer will be selected from node peerstore // If a peer cannot be found in the service slot, a peer will be selected from node peerstore
func (pm *PeerManager) SelectPeerByContentTopics(proto protocol.ID, contentTopics []string, specificPeers ...peer.ID) (peer.ID, error) { func (pm *PeerManager) SelectPeerByContentTopics(proto protocol.ID, contentTopics []string, specificPeers ...peer.ID) (peer.ID, error) {
pubsubTopics := []string{} pubsubTopics := []string{}
var clusterID *uint32
*clusterID = 0
for _, cTopic := range contentTopics { for _, cTopic := range contentTopics {
pubsubTopic, err := waku_proto.GetPubSubTopicFromContentTopic(cTopic) if pm.metadata != nil {
clusterID, _, _ = pm.metadata.ClusterAndShards()
}
pubsubTopic, err := waku_proto.GetPubSubTopicFromContentTopic(uint16(*clusterID), cTopic)
if err != nil { if err != nil {
pm.logger.Debug("selectPeer: failed to get contentTopic from pubsubTopic", zap.String("contentTopic", cTopic)) pm.logger.Debug("selectPeer: failed to get contentTopic from pubsubTopic", zap.String("contentTopic", cTopic))
return "", err return "", err

4
waku/v2/protocol/content_filter.go
View File

@ -51,6 +51,6 @@ func (cf ContentFilter) Equals(cf1 ContentFilter) bool {
} }
// This function converts a contentFilter into a map of pubSubTopics and corresponding contentTopics // This function converts a contentFilter into a map of pubSubTopics and corresponding contentTopics
func ContentFilterToPubSubTopicMap(contentFilter ContentFilter) (map[PubsubTopicStr][]ContentTopicStr, error) { func ContentFilterToPubSubTopicMap(clusterID uint16, contentFilter ContentFilter) (map[PubsubTopicStr][]ContentTopicStr, error) {
return GeneratePubsubToContentTopicMap(contentFilter.PubsubTopic, contentFilter.ContentTopicsList()) return GeneratePubsubToContentTopicMap(clusterID, contentFilter.PubsubTopic, contentFilter.ContentTopicsList())
} }

20
waku/v2/protocol/shard.go
View File

@ -12,9 +12,9 @@ import (
const MaxShardIndex = uint16(1023) const MaxShardIndex = uint16(1023)
// ClusterIndex is the clusterID used in sharding space. // DefaultClusterIndex is the clusterID used in sharding space.
// For shardIDs allocation and other magic numbers refer to RFC 51 // For shardIDs allocation and other magic numbers refer to RFC 51
const ClusterIndex = 1 const DefaultClusterIndex = 1
// GenerationZeroShardsCount is number of shards supported in generation-0 // GenerationZeroShardsCount is number of shards supported in generation-0
const GenerationZeroShardsCount = 8 const GenerationZeroShardsCount = 8
@ -229,7 +229,7 @@ func FromBitVector(buf []byte) (RelayShards, error) {
// GetShardFromContentTopic runs Autosharding logic and returns a pubSubTopic // GetShardFromContentTopic runs Autosharding logic and returns a pubSubTopic
// This is based on Autosharding algorithm defined in RFC 51 // This is based on Autosharding algorithm defined in RFC 51
func GetShardFromContentTopic(topic ContentTopic, shardCount int) StaticShardingPubsubTopic { func GetShardFromContentTopic(topic ContentTopic, clusterID uint16, shardCount int) StaticShardingPubsubTopic {
bytes := []byte(topic.ApplicationName) bytes := []byte(topic.ApplicationName)
bytes = append(bytes, []byte(topic.ApplicationVersion)...) bytes = append(bytes, []byte(topic.ApplicationVersion)...)
@ -238,28 +238,30 @@ func GetShardFromContentTopic(topic ContentTopic, shardCount int) StaticSharding
hashValue := binary.BigEndian.Uint64(hash[24:]) hashValue := binary.BigEndian.Uint64(hash[24:])
shard := hashValue % uint64(shardCount) shard := hashValue % uint64(shardCount)
if clusterID == 0 {
return NewStaticShardingPubsubTopic(ClusterIndex, uint16(shard)) //TODO: should we return error??
}
return NewStaticShardingPubsubTopic(clusterID, uint16(shard))
} }
func GetPubSubTopicFromContentTopic(cTopicString string) (string, error) { func GetPubSubTopicFromContentTopic(clusterID uint16, cTopicString string) (string, error) {
cTopic, err := StringToContentTopic(cTopicString) cTopic, err := StringToContentTopic(cTopicString)
if err != nil { if err != nil {
return "", fmt.Errorf("%s : %s", err.Error(), cTopicString) return "", fmt.Errorf("%s : %s", err.Error(), cTopicString)
} }
pTopic := GetShardFromContentTopic(cTopic, GenerationZeroShardsCount) pTopic := GetShardFromContentTopic(cTopic, clusterID, GenerationZeroShardsCount)
return pTopic.String(), nil return pTopic.String(), nil
} }
func GeneratePubsubToContentTopicMap(pubsubTopic string, contentTopics []string) (map[string][]string, error) { func GeneratePubsubToContentTopicMap(clusterID uint16, pubsubTopic string, contentTopics []string) (map[string][]string, error) {
pubSubTopicMap := make(map[string][]string, 0) pubSubTopicMap := make(map[string][]string, 0)
if pubsubTopic == "" { if pubsubTopic == "" {
//Should we derive pubsub topic from contentTopic so that peer selection and discovery can be done accordingly? //Should we derive pubsub topic from contentTopic so that peer selection and discovery can be done accordingly?
for _, cTopic := range contentTopics { for _, cTopic := range contentTopics {
pTopic, err := GetPubSubTopicFromContentTopic(cTopic) pTopic, err := GetPubSubTopicFromContentTopic(clusterID, cTopic)
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
waku/v2/protocol/topic_test.go
View File

@ -41,8 +41,8 @@ func TestContentTopicAndSharding(t *testing.T) {
ct6, err := StringToContentTopic("/toychat/2/huilong/proto") ct6, err := StringToContentTopic("/toychat/2/huilong/proto")
require.NoError(t, err) require.NoError(t, err)
nsPubSubT1 := GetShardFromContentTopic(ct6, GenerationZeroShardsCount) nsPubSubT1 := GetShardFromContentTopic(ct6, DefaultClusterIndex, GenerationZeroShardsCount)
require.Equal(t, NewStaticShardingPubsubTopic(ClusterIndex, 3), nsPubSubT1) require.Equal(t, NewStaticShardingPubsubTopic(DefaultClusterIndex, 3), nsPubSubT1)
_, err = StringToContentTopic("/abc/toychat/2/huilong/proto") _, err = StringToContentTopic("/abc/toychat/2/huilong/proto")
require.Error(t, err, ErrInvalidGeneration) require.Error(t, err, ErrInvalidGeneration)
@ -91,7 +91,7 @@ func TestShardChoiceSimulation(t *testing.T) {
// When // When
for _, topic := range topics { for _, topic := range topics {
pubsub := GetShardFromContentTopic(topic, GenerationZeroShardsCount) pubsub := GetShardFromContentTopic(topic, DefaultClusterIndex, GenerationZeroShardsCount)
counts[pubsub.Shard()]++ counts[pubsub.Shard()]++
} }