From 305c814215ee43ee7ff87d6b0af471c0263c75ae Mon Sep 17 00:00:00 2001 From: neza2017 Date: Tue, 26 Jan 2021 19:37:25 +0800 Subject: [PATCH] Fix master Signed-off-by: neza2017 --- cmd/masterservice/main.go | 3 +++ internal/masterservice/master_service.go | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/masterservice/main.go b/cmd/masterservice/main.go index e1886b77aa..a683e4a28f 100644 --- a/cmd/masterservice/main.go +++ b/cmd/masterservice/main.go @@ -36,6 +36,9 @@ func main() { psc.Params.Init() log.Printf("proxy service address : %s", psc.Params.ServiceAddress) proxyService := psc.NewClient(psc.Params.ServiceAddress) + if err = proxyService.Init(); err != nil { + panic(err) + } for cnt = 0; cnt < reTryCnt; cnt++ { pxStates, err := proxyService.GetComponentStates() diff --git a/internal/masterservice/master_service.go b/internal/masterservice/master_service.go index 89d7b10749..d2d8ab7613 100644 --- a/internal/masterservice/master_service.go +++ b/internal/masterservice/master_service.go @@ -247,7 +247,9 @@ func (c *Core) checkInit() error { if c.DataNodeSegmentFlushCompletedChan == nil { return errors.Errorf("DataNodeSegmentFlushCompletedChan is nil") } - log.Printf("master node id = %d\n", Params.NodeID) + log.Printf("master node id = %d", Params.NodeID) + log.Printf("master dd channel name = %s", Params.DdChannel) + log.Printf("master time ticke channel name = %s", Params.TimeTickChannel) return nil } @@ -607,6 +609,7 @@ func (c *Core) SetProxyService(s ProxyServiceInterface) error { return err } Params.ProxyTimeTickChannel = rsp + log.Printf("proxy time tick channel name = %s", Params.ProxyTimeTickChannel) c.InvalidateCollectionMetaCache = func(ts typeutil.Timestamp, dbName string, collectionName string) error { err := s.InvalidateCollectionMetaCache(&proxypb.InvalidateCollMetaCacheRequest{ @@ -633,6 +636,8 @@ func (c *Core) SetDataService(s DataServiceInterface) error { return err } Params.DataServiceSegmentChannel = rsp + log.Printf("data service segment channel name = %s", Params.DataServiceSegmentChannel) + c.GetBinlogFilePathsFromDataServiceReq = func(segID typeutil.UniqueID, fieldID typeutil.UniqueID) ([]string, error) { ts, err := c.tsoAllocator.Alloc(1) if err != nil {