Merge pull request #655 from chrislusf/filer1_maintenance_branch

fix mysql bug
This commit is contained in:
Chris Lu 2018-05-22 00:16:42 -07:00 committed by GitHub
commit 03fd66e209
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -148,10 +148,14 @@ func (s *MySqlStore) Put(fullFilePath string, fid string) (err error) {
} else { } else {
if len(old_fid) == 0 { if len(old_fid) == 0 {
err = s.insert(fullFilePath, fid, s.dbs[instance_offset], tableFullName) err = s.insert(fullFilePath, fid, s.dbs[instance_offset], tableFullName)
err = fmt.Errorf("MySqlStore Put operation failed when inserting path %s with fid %s : err is %v", fullFilePath, fid, err) if err != nil {
err = fmt.Errorf("MySqlStore Put operation failed when inserting path %s with fid %s : err is %v", fullFilePath, fid, err)
}
} else { } else {
err = s.update(fullFilePath, fid, s.dbs[instance_offset], tableFullName) err = s.update(fullFilePath, fid, s.dbs[instance_offset], tableFullName)
err = fmt.Errorf("MySqlStore Put operation failed when updating path %s with fid %s : err is %v", fullFilePath, fid, err) if err != nil {
err = fmt.Errorf("MySqlStore Put operation failed when updating path %s with fid %s : err is %v", fullFilePath, fid, err)
}
} }
} }
return return