gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

filer store: sql update if any insert error happens

Browse source 
fix https://github.com/chrislusf/seaweedfs/issues/1673
This commit is contained in:
Chris Lu 2020-12-13 20:49:44 -08:00
parent 23280257df
commit 38fc89d041
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
weed/filer/abstract_sql/abstract_sql_store.go
View file

@ -77,7 +77,8 @@ func (store *AbstractSqlStore) InsertEntry(ctx context.Context, entry *filer.Ent
} }
if !strings.Contains(strings.ToLower(err.Error()), "duplicate") { if !strings.Contains(strings.ToLower(err.Error()), "duplicate") {
return fmt.Errorf("kv insert: %s", err) // return fmt.Errorf("insert: %s", err)
// skip this since the error can be in a different language
} }
// now the insert failed possibly due to duplication constraints // now the insert failed possibly due to duplication constraints

5
weed/filer/abstract_sql/abstract_sql_store_kv.go
View file

@ -21,7 +21,8 @@ func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []by
} }
if !strings.Contains(strings.ToLower(err.Error()), "duplicate") { if !strings.Contains(strings.ToLower(err.Error()), "duplicate") {
return fmt.Errorf("kv insert: %s", err) // return fmt.Errorf("kv insert: %s", err)
// skip this since the error can be in a different language
} }
// now the insert failed possibly due to duplication constraints // now the insert failed possibly due to duplication constraints
@ -33,7 +34,7 @@ func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []by
} }
_, err = res.RowsAffected() _, err = res.RowsAffected()
if err != nil { if err != nil {
return fmt.Errorf("kv upsert no rows affected: %s", err) return fmt.Errorf("kv upsert no rows affected: %s", err)
} }
return nil return nil