.

go/neo/client/client.go

@@ -281,10 +281,7 @@ func (c *Client) recvMaster(ctx context.Context, mlink *neo.NodeLink) (err error
 		if err != nil {
 			return err
 		}
-		err = req.Close()
-		if err != nil {
-			return err
-		}
+		req.Close()
 
 		c.node.StateMu.Lock()
 

go/neo/server/cluster_test.go

@@ -90,8 +90,8 @@ type traceNeoSend struct {
 	ConnID   uint32
 	Msg	 neo.Msg
 }
-func (t *MyTracer) traceNeoConnSendPre(c *neo.Conn, msg neo.Msg) {
-	t.Trace1(&traceNeoSend{c.Link().LocalAddr(), c.Link().RemoteAddr(), c.ConnID(), msg})
+func (t *MyTracer) traceNeoMsgSendPre(l *neo.NodeLink, connID uint32, msg neo.Msg) {
+	t.Trace1(&traceNeoSend{l.LocalAddr(), l.RemoteAddr(), connID, msg})
 }
 
 // cluster state changed
@@ -160,8 +160,8 @@ func TestMasterStorage(t *testing.T) {
 	defer pg.Done()
 
 	tracing.Lock()
-	//neo_traceConnRecv_Attach(pg, tracer.traceNeoConnRecv)
-	neo_traceConnSendPre_Attach(pg, tracer.traceNeoConnSendPre)
+	//neo_traceMsgRecv_Attach(pg, tracer.traceNeoMsgRecv)
+	neo_traceMsgSendPre_Attach(pg, tracer.traceNeoMsgSendPre)
 	neo_traceClusterStateChanged_Attach(pg, tracer.traceClusterState)
 	neo_traceNodeChanged_Attach(pg, tracer.traceNode)
 	traceMasterStartReady_Attach(pg, tracer.traceMasterStartReady)

go/neo/server/ztrace_test.go

@@ -13,7 +13,7 @@ import (
 // traceimport: "lab.nexedi.com/kirr/neo/go/neo"
 
 // rerun "gotrace gen" if you see link failure ↓↓↓
-//go:linkname neo_trace_exporthash lab.nexedi.com/kirr/neo/go/neo._trace_exporthash_ab325b43be064a06d1c80db96d5bf50678b5b037
+//go:linkname neo_trace_exporthash lab.nexedi.com/kirr/neo/go/neo._trace_exporthash_933f43c04bbb1566c5d1e9ea518f9ed6e0f147a7
 func neo_trace_exporthash()
 func init() { neo_trace_exporthash() }
 
@@ -21,11 +21,11 @@ func init() { neo_trace_exporthash() }
 //go:linkname neo_traceClusterStateChanged_Attach lab.nexedi.com/kirr/neo/go/neo.traceClusterStateChanged_Attach
 func neo_traceClusterStateChanged_Attach(*tracing.ProbeGroup, func(cs *neo.ClusterState)) *tracing.Probe
 
-//go:linkname neo_traceConnRecv_Attach lab.nexedi.com/kirr/neo/go/neo.traceConnRecv_Attach
-func neo_traceConnRecv_Attach(*tracing.ProbeGroup, func(c *neo.Conn, msg neo.Msg)) *tracing.Probe
+//go:linkname neo_traceMsgRecv_Attach lab.nexedi.com/kirr/neo/go/neo.traceMsgRecv_Attach
+func neo_traceMsgRecv_Attach(*tracing.ProbeGroup, func(c *neo.Conn, msg neo.Msg)) *tracing.Probe
 
-//go:linkname neo_traceConnSendPre_Attach lab.nexedi.com/kirr/neo/go/neo.traceConnSendPre_Attach
-func neo_traceConnSendPre_Attach(*tracing.ProbeGroup, func(c *neo.Conn, msg neo.Msg)) *tracing.Probe
+//go:linkname neo_traceMsgSendPre_Attach lab.nexedi.com/kirr/neo/go/neo.traceMsgSendPre_Attach
+func neo_traceMsgSendPre_Attach(*tracing.ProbeGroup, func(l *neo.NodeLink, connId uint32, msg neo.Msg)) *tracing.Probe
 
 //go:linkname neo_traceNodeChanged_Attach lab.nexedi.com/kirr/neo/go/neo.traceNodeChanged_Attach
 func neo_traceNodeChanged_Attach(*tracing.ProbeGroup, func(nt *neo.NodeTable, n *neo.Node)) *tracing.Probe