status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: improve StoreNodeRequestManager for community custom storenodes (#4860)

This commit is contained in:
Igor Sirotin 2024-03-04 20:46:25 +00:00 committed by GitHub
parent 440779fc8c
commit c217692c76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
protocol/messenger_store_node_request_manager.go
View File

@ -33,6 +33,17 @@ type storeNodeRequestID struct {
DataID string `json:"dataID"` DataID string `json:"dataID"`
} }
func (r *storeNodeRequestID) getCommunityID() string {
switch r.RequestType {
case storeNodeCommunityRequest:
return r.DataID
case storeNodeShardRequest:
return strings.TrimSuffix(r.DataID, transport.CommunityShardInfoTopicPrefix())
default:
return ""
}
}
type StoreNodeRequestManager struct { type StoreNodeRequestManager struct {
messenger *Messenger messenger *Messenger
logger *zap.Logger logger *zap.Logger
@ -502,24 +513,29 @@ func (r *storeNodeRequest) routine() {
r.finalize() r.finalize()
}() }()
communityIDStr := strings.TrimSuffix(r.requestID.DataID, transport.CommunityShardInfoTopicPrefix()) communityID := r.requestID.getCommunityID()
if !r.manager.messenger.communityStorenodes.HasStorenodeSetup(communityIDStr) && !r.manager.messenger.waitForAvailableStoreNode(storeNodeAvailableTimeout) {
if r.requestID.RequestType != storeNodeCommunityRequest || !r.manager.messenger.communityStorenodes.HasStorenodeSetup(communityID) {
if !r.manager.messenger.waitForAvailableStoreNode(storeNodeAvailableTimeout) {
r.result.err = fmt.Errorf("store node is not available") r.result.err = fmt.Errorf("store node is not available")
return return
} }
ms := r.manager.messenger.getActiveMailserver(communityIDStr) }
storeNode := r.manager.messenger.getActiveMailserver(communityID)
// Check if community already exists locally and get Clock. // Check if community already exists locally and get Clock.
if r.requestID.RequestType == storeNodeCommunityRequest {
localCommunity, _ := r.manager.messenger.communitiesManager.GetByIDString(r.requestID.DataID) localCommunity, _ := r.manager.messenger.communitiesManager.GetByIDString(communityID)
if localCommunity != nil { if localCommunity != nil {
r.minimumDataClock = localCommunity.Clock() r.minimumDataClock = localCommunity.Clock()
} }
}
// Start store node request // Start store node request
from, to := r.manager.messenger.calculateMailserverTimeBounds(oneMonthDuration) from, to := r.manager.messenger.calculateMailserverTimeBounds(oneMonthDuration)
_, err := r.manager.messenger.performMailserverRequest(ms, func(ms mailservers.Mailserver) (*MessengerResponse, error) { _, err := r.manager.messenger.performMailserverRequest(storeNode, func(ms mailservers.Mailserver) (*MessengerResponse, error) {
batch := MailserverBatch{ batch := MailserverBatch{
From: from, From: from,
To: to, To: to,

1
protocol/messenger_storenode_request_test.go
View File

@ -583,6 +583,7 @@ func (s *MessengerStoreNodeRequestSuite) TestRequestProfileInfo() {
s.Require().NoError(err) s.Require().NoError(err)
s.createBob() s.createBob()
s.waitForAvailableStoreNode(s.bob)
s.fetchProfile(s.bob, s.owner.selfContact.ID, s.owner.selfContact) s.fetchProfile(s.bob, s.owner.selfContact.ID, s.owner.selfContact)
} }