diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-05-27 00:00:56 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-05-27 00:00:56 -0700 |
| commit | 603de2d5db1f5c17e73db2b46c34b4e1efcf9815 (patch) | |
| tree | 5cbdadfe3cc55d3eb464419ad7a90ea2d5746054 | |
| parent | f124ebab1dd305687d897b50760647088a5d7985 (diff) | |
| download | seaweedfs-603de2d5db1f5c17e73db2b46c34b4e1efcf9815.tar.xz seaweedfs-603de2d5db1f5c17e73db2b46c34b4e1efcf9815.zip | |
skip deletion if entry not found
| -rw-r--r-- | weed/filer2/abstract_sql/abstract_sql_store.go | 5 | ||||
| -rw-r--r-- | weed/filer2/leveldb/leveldb_store.go | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/weed/filer2/abstract_sql/abstract_sql_store.go b/weed/filer2/abstract_sql/abstract_sql_store.go index bfc76fbc0..e924fa16a 100644 --- a/weed/filer2/abstract_sql/abstract_sql_store.go +++ b/weed/filer2/abstract_sql/abstract_sql_store.go @@ -79,7 +79,10 @@ func (store *AbstractSqlStore) FindEntry(fullpath filer2.FullPath) (*filer2.Entr func (store *AbstractSqlStore) DeleteEntry(fullpath filer2.FullPath) (*filer2.Entry, error) { - entry, _ := store.FindEntry(fullpath) + entry, err := store.FindEntry(fullpath) + if err != nil { + return nil, nil + } dir, name := fullpath.DirAndName() diff --git a/weed/filer2/leveldb/leveldb_store.go b/weed/filer2/leveldb/leveldb_store.go index 00fb44d36..8b2df93ac 100644 --- a/weed/filer2/leveldb/leveldb_store.go +++ b/weed/filer2/leveldb/leveldb_store.go @@ -96,7 +96,10 @@ func (store *LevelDBStore) FindEntry(fullpath filer2.FullPath) (entry *filer2.En func (store *LevelDBStore) DeleteEntry(fullpath filer2.FullPath) (entry *filer2.Entry, err error) { key := genKey(fullpath.DirAndName()) - entry, _ = store.FindEntry(fullpath) + entry, err = store.FindEntry(fullpath) + if err != nil { + return nil, nil + } err = store.db.Delete(key, nil) if err != nil { |