From 87d7312bf6edea56c2529b5be39e6ca033909840 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 1 Sep 2020 22:47:57 -0700 Subject: [PATCH] mysql/postgres: properly report entry not found --- weed/filer/abstract_sql/abstract_sql_store.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/weed/filer/abstract_sql/abstract_sql_store.go b/weed/filer/abstract_sql/abstract_sql_store.go index 891fe305f..e87ecb9fb 100644 --- a/weed/filer/abstract_sql/abstract_sql_store.go +++ b/weed/filer/abstract_sql/abstract_sql_store.go @@ -116,10 +116,13 @@ func (store *AbstractSqlStore) FindEntry(ctx context.Context, fullpath util.Full dir, name := fullpath.DirAndName() row := store.getTxOrDB(ctx).QueryRowContext(ctx, store.SqlFind, util.HashStringToLong(dir), name, dir) + var data []byte if err := row.Scan(&data); err != nil { - glog.Errorf("find %s: %v", fullpath, err) - return nil, filer_pb.ErrNotFound + if err == sql.ErrNoRows { + return nil, filer_pb.ErrNotFound + } + return nil, fmt.Errorf("find %s: %v", fullpath, err) } entry := &filer.Entry{