This is an automated email from the ASF dual-hosted git repository. littlecui pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/servicecomb-kie.git
commit 9861c093d90cde4389a1bb45f0f0241f1865b68d Author: songshiyuan 00649746 <[email protected]> AuthorDate: Wed Dec 13 00:26:48 2023 +0800 fix the bug of do not report the error which occured in action of get kvdocs from etcd --- server/datasource/etcd/kv/kv_cache.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/datasource/etcd/kv/kv_cache.go b/server/datasource/etcd/kv/kv_cache.go index ba7b346..74012cf 100644 --- a/server/datasource/etcd/kv/kv_cache.go +++ b/server/datasource/etcd/kv/kv_cache.go @@ -272,7 +272,7 @@ func (kc *Cache) getKvFromEtcd(ctx context.Context, req *CacheSearchReq, kvIdsLe openlog.Debug("get kv from etcd by kvId") wg := sync.WaitGroup{} docs := make([]*model.KVDoc, len(kvIdsLeft)) - var Err error + var getKvErr error for i, kvID := range kvIdsLeft { wg.Add(1) go func(kvID string, cnt int) { @@ -282,14 +282,14 @@ func (kc *Cache) getKvFromEtcd(ctx context.Context, req *CacheSearchReq, kvIdsLe kv, err := etcdadpt.Get(ctx, docKey) if err != nil { openlog.Error(fmt.Sprintf("failed to get kv from etcd, err %v", err)) - Err = err + getKvErr = err return } doc, err := kc.GetKvDoc(kv) if err != nil { openlog.Error(fmt.Sprintf("failed to unmarshal kv, err %v", err)) - Err = err + getKvErr = err return } @@ -298,8 +298,8 @@ func (kc *Cache) getKvFromEtcd(ctx context.Context, req *CacheSearchReq, kvIdsLe }(kvID, i) } wg.Wait() - if Err != nil { - return nil, Err + if getKvErr != nil { + return nil, getKvErr } return docs, nil }
