diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-12-13 20:49:44 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-12-13 20:49:44 -0800 |
| commit | 38fc89d04133ccb686ef4ec226b917070f74a941 (patch) | |
| tree | f2706383fdcf86f2a9ffee038d57891db974573f | |
| parent | 23280257dfb851ae645257c252bb1f66bcc59819 (diff) | |
| download | seaweedfs-38fc89d04133ccb686ef4ec226b917070f74a941.tar.xz seaweedfs-38fc89d04133ccb686ef4ec226b917070f74a941.zip | |
filer store: sql update if any insert error happens
fix https://github.com/chrislusf/seaweedfs/issues/1673
| -rw-r--r-- | weed/filer/abstract_sql/abstract_sql_store.go | 3 | ||||
| -rw-r--r-- | weed/filer/abstract_sql/abstract_sql_store_kv.go | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/weed/filer/abstract_sql/abstract_sql_store.go b/weed/filer/abstract_sql/abstract_sql_store.go index 7c95ffb57..da104358b 100644 --- a/weed/filer/abstract_sql/abstract_sql_store.go +++ b/weed/filer/abstract_sql/abstract_sql_store.go @@ -77,7 +77,8 @@ func (store *AbstractSqlStore) InsertEntry(ctx context.Context, entry *filer.Ent } 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 diff --git a/weed/filer/abstract_sql/abstract_sql_store_kv.go b/weed/filer/abstract_sql/abstract_sql_store_kv.go index 49db8af65..81d105134 100644 --- a/weed/filer/abstract_sql/abstract_sql_store_kv.go +++ b/weed/filer/abstract_sql/abstract_sql_store_kv.go @@ -21,7 +21,8 @@ func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []by } 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 @@ -33,7 +34,7 @@ func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []by } _, err = res.RowsAffected() - if err != nil { + if err != nil { return fmt.Errorf("kv upsert no rows affected: %s", err) } return nil |