aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-09-01 22:47:57 -0700
committerChris Lu <chris.lu@gmail.com>2020-09-01 22:47:57 -0700
commit87d7312bf6edea56c2529b5be39e6ca033909840 (patch)
treed9e8861b42b4d65364aa365a26782d9280fa7d55
parent72b0a5f1d1481d779be64f24ab8cc3fad056847c (diff)
downloadseaweedfs-87d7312bf6edea56c2529b5be39e6ca033909840.tar.xz
seaweedfs-87d7312bf6edea56c2529b5be39e6ca033909840.zip
mysql/postgres: properly report entry not found
-rw-r--r--weed/filer/abstract_sql/abstract_sql_store.go7
1 files 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{