From 94dfab5b2125684f2ad15f5b117d41b6643658d4 Mon Sep 17 00:00:00 2001 From: godchen Date: Mon, 1 Feb 2021 10:53:13 +0800 Subject: [PATCH] Check collection whether exists before drop Signed-off-by: godchen --- internal/distributed/proxynode/client/client.go | 2 +- internal/proxynode/task.go | 8 ++++---- internal/proxyservice/impl.go | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/internal/distributed/proxynode/client/client.go b/internal/distributed/proxynode/client/client.go index 793a875213..637f912d12 100644 --- a/internal/distributed/proxynode/client/client.go +++ b/internal/distributed/proxynode/client/client.go @@ -21,7 +21,7 @@ func (c *Client) Init() error { if err != nil { return err } - c.grpcClient = proxypb.NewProxyServiceClient(conn) + c.grpcClient = proxypb.NewProxyNodeServiceClient(conn) return nil } err := retry.Retry(10, time.Millisecond*200, connectGrpcFunc) diff --git a/internal/proxynode/task.go b/internal/proxynode/task.go index a25b8ea4f8..a2ca45a71e 100644 --- a/internal/proxynode/task.go +++ b/internal/proxynode/task.go @@ -411,12 +411,12 @@ func (dct *DropCollectionTask) PreExecute() error { func (dct *DropCollectionTask) Execute() error { var err error + collID, err := globalMetaCache.GetCollectionID(dct.CollectionName) + if err != nil { + return err + } dct.result, err = dct.masterClient.DropCollection(dct.DropCollectionRequest) if dct.result.ErrorCode == commonpb.ErrorCode_SUCCESS { - collID, err := globalMetaCache.GetCollectionID(dct.CollectionName) - if err != nil { - return err - } err = globalInsertChannelsMap.closeInsertMsgStream(collID) if err != nil { return err diff --git a/internal/proxyservice/impl.go b/internal/proxyservice/impl.go index 078903eaec..92c1b3b569 100644 --- a/internal/proxyservice/impl.go +++ b/internal/proxyservice/impl.go @@ -30,7 +30,6 @@ const ( MasterYamlContent = "advanced/master.yaml" ProxyNodeYamlContent = "advanced/proxy_node.yaml" QueryNodeYamlContent = "advanced/query_node.yaml" - WriteNodeYamlContent = "advanced/write_node.yaml" MilvusYamlContent = "milvus.yaml" ) @@ -62,7 +61,6 @@ func (s *ServiceImpl) fillNodeInitParams() error { masterYamlContent := getConfigContentByName(MasterYamlContent) proxyNodeYamlContent := getConfigContentByName(ProxyNodeYamlContent) queryNodeYamlContent := getConfigContentByName(QueryNodeYamlContent) - writeNodeYamlContent := getConfigContentByName(WriteNodeYamlContent) milvusYamlContent := getConfigContentByName(MilvusYamlContent) appendContent := func(key string, content []byte) { @@ -77,7 +75,6 @@ func (s *ServiceImpl) fillNodeInitParams() error { appendContent(MasterYamlContent, masterYamlContent) appendContent(ProxyNodeYamlContent, proxyNodeYamlContent) appendContent(QueryNodeYamlContent, queryNodeYamlContent) - appendContent(WriteNodeYamlContent, writeNodeYamlContent) appendContent(MilvusYamlContent, milvusYamlContent) // var allContent []byte