node: syncer panic send on closed channel (#2366)

towns-protocol · Feb 13, 2025 · 1beac1b · 1beac1b
1 parent 8524dde
commit 1beac1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/core/node/rpc/sync/client/local.go b/core/node/rpc/sync/client/local.go
@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/linkdata/deadlock"
 	. "github.com/towns-protocol/towns/core/node/base"

diff --git a/core/node/rpc/sync/client/syncer_set.go b/core/node/rpc/sync/client/syncer_set.go
@@ -177,7 +177,6 @@ func (ss *SyncerSet) Run() {
 	ss.muSyncers.Unlock()
 
 	ss.syncerTasks.Wait() // background syncers finished -> safe to close messages channel
-	close(ss.messages)    // close will cause the sync operation to send the SYNC_CLOSE message to the client
 }
 
 func (ss *SyncerSet) AddInitialStreams() {

diff --git a/core/node/rpc/sync/operation.go b/core/node/rpc/sync/operation.go
@@ -95,8 +95,10 @@ func (syncOp *StreamSyncOperation) Run(
 ) error {
 	log := logging.FromCtx(syncOp.ctx).With("syncId", syncOp.SyncID)
 
+	messagesSendToClient := 0
+
 	log.Info("Stream sync operation start")
-	defer log.Info("Stream sync operation stopped")
+	defer log.Infow("Stream sync operation stopped", "send", messagesSendToClient)
 
 	cookies, err := client.ValidateAndGroupSyncCookies(req.Msg.GetSyncPos())
 	if err != nil {
@@ -131,6 +133,8 @@ func (syncOp *StreamSyncOperation) Run(
 				return err
 			}
 
+			messagesSendToClient++
+
 			log.Debug("Pending messages in sync operation", "count", len(messages))
 
 		case <-syncOp.ctx.Done():