From 0bb68cac3686c22ee9da10837420cee570d7feac Mon Sep 17 00:00:00 2001
From: wei liu <wei.liu@zilliz.com>
Date: Wed, 23 Aug 2023 09:56:21 +0800
Subject: [PATCH] fix CollectionNotExist on describe rg (#26541)

Signed-off-by: Wei Liu <wei.liu@zilliz.com>
---
 internal/proxy/task.go      | 7 ++++++-
 internal/proxy/task_test.go | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/internal/proxy/task.go b/internal/proxy/task.go
index 13585a9a11..1270cd2392 100644
--- a/internal/proxy/task.go
+++ b/internal/proxy/task.go
@@ -2211,11 +2211,16 @@ func (t *DescribeResourceGroupTask) Execute(ctx context.Context) error {
 	getCollectionName := func(collections map[int64]int32) (map[string]int32, error) {
 		ret := make(map[string]int32)
 		for key, value := range collections {
-			name, err := globalMetaCache.GetCollectionName(ctx, GetCurDBNameFromContextOrDefault(ctx), key)
+			name, err := globalMetaCache.GetCollectionName(ctx, "", key)
 			if err != nil {
 				log.Warn("failed to get collection name",
 					zap.Int64("collectionID", key),
 					zap.Error(err))
+
+				// if collection has been dropped, skip it
+				if common.IsCollectionNotExistError(err) {
+					continue
+				}
 				return nil, err
 			}
 			ret[name] = value
diff --git a/internal/proxy/task_test.go b/internal/proxy/task_test.go
index b689eae625..aa047cc726 100644
--- a/internal/proxy/task_test.go
+++ b/internal/proxy/task_test.go
@@ -3115,7 +3115,9 @@ func TestDescribeResourceGroupTaskFailed(t *testing.T) {
 		},
 	}, nil)
 	err = task.Execute(ctx)
-	assert.Error(t, err)
+	assert.NoError(t, err)
+	assert.Len(t, task.result.ResourceGroup.NumOutgoingNode, 0)
+	assert.Len(t, task.result.ResourceGroup.NumIncomingNode, 0)
 }
 
 func TestCreateCollectionTaskWithPartitionKey(t *testing.T) {