gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

set df.File to nil after it is closed

Browse source 
possibly fix https://github.com/seaweedfs/seaweedfs/issues/4530
This commit is contained in:
chrislu 2023-06-02 17:16:45 -07:00
parent 70fc8d06f3
commit e23f3d6eca
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
weed/storage/backend/disk_file.go
View file

@ -40,10 +40,16 @@ func NewDiskFile(f *os.File) *DiskFile {
} }
func (df *DiskFile) ReadAt(p []byte, off int64) (n int, err error) { func (df *DiskFile) ReadAt(p []byte, off int64) (n int, err error) {
if df.File == nil {
return 0, os.ErrClosed
}
return df.File.ReadAt(p, off) return df.File.ReadAt(p, off)
} }
func (df *DiskFile) WriteAt(p []byte, off int64) (n int, err error) { func (df *DiskFile) WriteAt(p []byte, off int64) (n int, err error) {
if df.File == nil {
return 0, os.ErrClosed
}
n, err = df.File.WriteAt(p, off) n, err = df.File.WriteAt(p, off)
if err == nil { if err == nil {
waterMark := off + int64(n) waterMark := off + int64(n)
@ -60,6 +66,9 @@ func (df *DiskFile) Write(p []byte) (n int, err error) {
} }
func (df *DiskFile) Truncate(off int64) error { func (df *DiskFile) Truncate(off int64) error {
if df.File == nil {
return os.ErrClosed
}
err := df.File.Truncate(off) err := df.File.Truncate(off)
if err == nil { if err == nil {
df.fileSize = off df.fileSize = off
@ -69,15 +78,22 @@ func (df *DiskFile) Truncate(off int64) error {
} }
func (df *DiskFile) Close() error { func (df *DiskFile) Close() error {
if df.File == nil {
return nil
}
if err := df.Sync(); err != nil { if err := df.Sync(); err != nil {
return err return err
} }
return df.File.Close() if err := df.File.Close(); err != nil {
return err
}
df.File = nil
return nil
} }
func (df *DiskFile) GetStat() (datSize int64, modTime time.Time, err error) { func (df *DiskFile) GetStat() (datSize int64, modTime time.Time, err error) {
if df.File == nil { if df.File == nil {
err = os.ErrInvalid err = os.ErrClosed
} }
return df.fileSize, df.modTime, err return df.fileSize, df.modTime, err
} }
@ -88,7 +104,7 @@ func (df *DiskFile) Name() string {
func (df *DiskFile) Sync() error { func (df *DiskFile) Sync() error {
if df.File == nil { if df.File == nil {
return os.ErrInvalid return os.ErrClosed
} }
if isMac { if isMac {
return nil return nil