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

refactor: file close error 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2023-08-08 12:08:15 +08:00
parent 342438eae6
commit bd140f1104
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
7 changed files with 33 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/daemon/objectstorage/objectstorage.go
View File

@ -592,8 +592,7 @@ func (o *objectStorage) md5FromFileHeader(fileHeader *multipart.FileHeader) (dig
return nil return nil
} }
defer func() { defer func() {
errClose := f.Close() if err := f.Close(); err != nil {
if errClose != nil {
dig = nil dig = nil
} }
}() }()
@ -608,9 +607,8 @@ func (o *objectStorage) importObjectToBackend(ctx context.Context, bucketName, o
return err return err
} }
defer func() { defer func() {
errClose := f.Close() if cerr := f.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
@ -689,9 +687,8 @@ func (o *objectStorage) importObjectToSeedPeer(ctx context.Context, seedPeerHost
return err return err
} }
defer func() { defer func() {
errClose := f.Close() if cerr := f.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()

5
client/daemon/peer/piece_manager.go
View File

@ -674,9 +674,8 @@ func (pm *pieceManager) ImportFile(ctx context.Context, ptm storage.PeerTaskMeta
return errors.New(msg) return errors.New(msg)
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()

20
client/daemon/storage/local_storage.go
View File

@ -130,9 +130,8 @@ func (t *localTaskStore) WritePiece(ctx context.Context, req *WritePieceRequest)
return 0, err return 0, err
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
@ -405,9 +404,8 @@ func (t *localTaskStore) Store(ctx context.Context, req *StoreRequest) (err erro
return err return err
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
@ -422,9 +420,8 @@ func (t *localTaskStore) Store(ctx context.Context, req *StoreRequest) (err erro
return err return err
} }
defer func() { defer func() {
errClose := dstFile.Close() if cerr := dstFile.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
// copy_file_range is valid in linux // copy_file_range is valid in linux
@ -658,9 +655,8 @@ func (t *localTaskStore) saveMetadata() (err error) {
return err return err
} }
defer func() { defer func() {
errClose := metadata.Close() if cerr := metadata.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
_, err = metadata.Write(data) _, err = metadata.Write(data)

15
client/daemon/storage/local_storage_subtask.go
View File

@ -74,9 +74,8 @@ func (t *localSubTaskStore) WritePiece(ctx context.Context, req *WritePieceReque
return 0, err return 0, err
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
// TODO different with localTaskStore // TODO different with localTaskStore
@ -315,9 +314,8 @@ func (t *localSubTaskStore) Store(ctx context.Context, req *StoreRequest) (err e
return err return err
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
@ -332,9 +330,8 @@ func (t *localSubTaskStore) Store(ctx context.Context, req *StoreRequest) (err e
return err return err
} }
defer func() { defer func() {
errClose := dstFile.Close() if cerr := dstFile.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
// copy_file_range is valid in linux // copy_file_range is valid in linux

10
client/dfget/dfget.go
View File

@ -164,9 +164,8 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st
fmt.Printf("remove temporary file %s error: %s\n", tempPath, removeErr) fmt.Printf("remove temporary file %s error: %s\n", tempPath, removeErr)
} }
} }
errClose := tempFile.Close() if cerr := tempFile.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
@ -178,9 +177,8 @@ func downloadFromSource(ctx context.Context, cfg *config.DfgetConfig, hdr map[st
return err return err
} }
defer func() { defer func() {
errClose := response.Body.Close() if cerr := response.Body.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
if err = response.Validate(); err != nil { if err = response.Validate(); err != nil {

10
scheduler/storage/storage.go
View File

@ -386,9 +386,8 @@ func (s *storage) createDownload(downloads ...Download) (err error) {
return err return err
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
@ -402,9 +401,8 @@ func (s *storage) createNetworkTopology(networkTopologies ...NetworkTopology) (e
return err return err
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()

10
trainer/storage/storage.go
View File

@ -81,9 +81,8 @@ func (s *storage) ListDownload(key string) (downloads []schedulerstorage.Downloa
return nil, err return nil, err
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()
@ -101,9 +100,8 @@ func (s *storage) ListNetworkTopology(key string) (networkTopologies []scheduler
return nil, err return nil, err
} }
defer func() { defer func() {
errClose := file.Close() if cerr := file.Close(); cerr != nil {
if errClose != nil { err = errors.Join(err, cerr)
err = errors.Join(err, errClose)
} }
}() }()