gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into support_ssd_volume

Browse Source
This commit is contained in:
Chris Lu
2020-12-13 22:14:18 -08:00
parent a9db24cd05 38fc89d041
commit c45d6a865b
2 changed files with 11 additions and 8 deletions
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

16
weed/filer/abstract_sql/abstract_sql_store_kv.go
View File

@@ -5,11 +5,10 @@ import (
"database/sql" "database/sql"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"strings"
"github.com/chrislusf/seaweedfs/weed/filer" "github.com/chrislusf/seaweedfs/weed/filer"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"strings"
) )
func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []byte) (err error) { func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []byte) (err error) {
@@ -17,10 +16,13 @@ func (store *AbstractSqlStore) KvPut(ctx context.Context, key []byte, value []by
dirStr, dirHash, name := genDirAndName(key) dirStr, dirHash, name := genDirAndName(key)
res, err := store.getTxOrDB(ctx).ExecContext(ctx, store.SqlInsert, dirHash, name, dirStr, value) res, err := store.getTxOrDB(ctx).ExecContext(ctx, store.SqlInsert, dirHash, name, dirStr, value)
if err != nil { if err == nil {
if !strings.Contains(strings.ToLower(err.Error()), "duplicate") { return
return fmt.Errorf("kv insert: %s", err) }
}
if !strings.Contains(strings.ToLower(err.Error()), "duplicate") {
// 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
@@ -32,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