From b9cf4c1095cd0d6172fb92f19fa63ca2b698a1b0 Mon Sep 17 00:00:00 2001 From: sunby Date: Wed, 26 May 2021 12:04:38 +0800 Subject: [PATCH] Fix recovery (#5417) Signed-off-by: sunby --- internal/dataservice/cluster_session_manager.go | 5 ++++- internal/dataservice/server_test.go | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/dataservice/cluster_session_manager.go b/internal/dataservice/cluster_session_manager.go index a025a06367..fc0a6696e1 100644 --- a/internal/dataservice/cluster_session_manager.go +++ b/internal/dataservice/cluster_session_manager.go @@ -33,7 +33,10 @@ func newClusterSessionManager() *clusterSessionManager { } func (m *clusterSessionManager) createSession(addr string) error { - cli := grpcdatanodeclient.NewClient(addr) + cli, err := grpcdatanodeclient.NewClient(addr, 0, []string{}, 0) + if err != nil { + return err + } if err := cli.Init(); err != nil { return err } diff --git a/internal/dataservice/server_test.go b/internal/dataservice/server_test.go index e56d4cad91..134db5134d 100644 --- a/internal/dataservice/server_test.go +++ b/internal/dataservice/server_test.go @@ -619,10 +619,11 @@ func TestDataNodeTtChannel(t *testing.T) { }) ch := make(chan interface{}, 1) - svr.createDataNodeClient = func(addr string) types.DataNode { - cli := newMockDataNodeClient(0) + svr.createDataNodeClient = func(addr string, serverID int64) (types.DataNode, error) { + cli, err := newMockDataNodeClient(0) + assert.Nil(t, err) cli.ch = ch - return cli + return cli, nil } ttMsgStream, err := svr.msFactory.NewMsgStream(context.TODO())