USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lfs: only remove file on io error (#6062)

pull/6066/head
ᴜɴᴋɴᴡᴏɴ 2020-04-05 01:29:51 +08:00 committed by GitHub
parent 3a5c93eeff
commit bae1d6ccd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
internal/db/lfs.go
View File

@ -48,33 +48,38 @@ type LFSObject struct {
CreatedAt time.Time `gorm:"NOT NULL"` CreatedAt time.Time `gorm:"NOT NULL"`
} }
func (db *lfs) CreateObject(repoID int64, oid lfsutil.OID, rc io.ReadCloser, storage lfsutil.Storage) (err error) { func (db *lfs) CreateObject(repoID int64, oid lfsutil.OID, rc io.ReadCloser, storage lfsutil.Storage) error {
if storage != lfsutil.StorageLocal { if storage != lfsutil.StorageLocal {
return errors.New("only local storage is supported") return errors.New("only local storage is supported")
} }
var ioerr error
fpath := lfsutil.StorageLocalPath(conf.LFS.ObjectsPath, oid) fpath := lfsutil.StorageLocalPath(conf.LFS.ObjectsPath, oid)
defer func() { defer func() {
rc.Close() rc.Close()
if err != nil { // NOTE: Only remove the file if there is an IO error, it is OK to
// leave the file when the whole operation failed with a DB error,
// a retry on client side can safely overwrite the same file as OID
// is seen as unique to every file.
if ioerr != nil {
_ = os.Remove(fpath) _ = os.Remove(fpath)
} }
}() }()
err = os.MkdirAll(filepath.Dir(fpath), os.ModePerm) ioerr = os.MkdirAll(filepath.Dir(fpath), os.ModePerm)
if err != nil { if ioerr != nil {
return errors.Wrap(err, "create directories") return errors.Wrap(ioerr, "create directories")
} }
w, err := os.Create(fpath) w, ioerr := os.Create(fpath)
if err != nil { if ioerr != nil {
return errors.Wrap(err, "create file") return errors.Wrap(ioerr, "create file")
} }
defer w.Close() defer w.Close()
written, err := io.Copy(w, rc) written, ioerr := io.Copy(w, rc)
if err != nil { if ioerr != nil {
return errors.Wrap(err, "copy file") return errors.Wrap(ioerr, "copy file")
} }
object := &LFSObject{ object := &LFSObject{