mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-07-09 02:26:47 +02:00
Code Issues Projects Releases Wiki Activity

Revert "volume: avoid file.stat(), file.seek() if possible during writes"

Browse source 
This reverts commit c78409a598.
This commit is contained in:
Chris Lu 2021-02-19 03:56:27 -08:00
parent b961cd6208
commit a1210d1e8d
2 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,8 +12,6 @@ var (
type DiskFile struct { type DiskFile struct {
File *os.File File *os.File
fullFilePath string fullFilePath string
fileSize int64
modTime time.Time
} }
func NewDiskFile(f *os.File) *DiskFile { func NewDiskFile(f *os.File) *DiskFile {
@ -28,24 +26,11 @@ func (df *DiskFile) ReadAt(p []byte, off int64) (n int, err error) {
} }
func (df *DiskFile) WriteAt(p []byte, off int64) (n int, err error) { func (df *DiskFile) WriteAt(p []byte, off int64) (n int, err error) {
n, err = df.File.WriteAt(p, off) return df.File.WriteAt(p, off)
if err == nil {
waterMark := off + int64(n)
if waterMark > df.fileSize {
df.fileSize = waterMark
df.modTime = time.Now()
}
}
return
} }
func (df *DiskFile) Truncate(off int64) error { func (df *DiskFile) Truncate(off int64) error {
err := df.File.Truncate(off) return df.File.Truncate(off)
if err == nil {
df.fileSize = off
df.modTime = time.Now()
}
return err
} }
func (df *DiskFile) Close() error { func (df *DiskFile) Close() error {
@ -53,9 +38,6 @@ func (df *DiskFile) Close() error {
} }
func (df *DiskFile) GetStat() (datSize int64, modTime time.Time, err error) { func (df *DiskFile) GetStat() (datSize int64, modTime time.Time, err error) {
if df.fileSize != 0 {
return df.fileSize, df.modTime, nil
}
stat, e := df.File.Stat() stat, e := df.File.Stat()
if e == nil { if e == nil {
return stat.Size(), stat.ModTime(), nil return stat.Size(), stat.ModTime(), nil
@ -68,6 +50,5 @@ func (df *DiskFile) Name() string {
} }
func (df *DiskFile) Sync() error { func (df *DiskFile) Sync() error {
df.fileSize = 0
return df.File.Sync() return df.File.Sync()
} }

16
weed/storage/needle_map.go
View file

@ -41,7 +41,6 @@ type baseNeedleMapper struct {
indexFile *os.File indexFile *os.File
indexFileAccessLock sync.Mutex indexFileAccessLock sync.Mutex
indexFileOffset int64
} }
func (nm *baseNeedleMapper) IndexFileSize() uint64 { func (nm *baseNeedleMapper) IndexFileSize() uint64 {
@ -57,18 +56,11 @@ func (nm *baseNeedleMapper) appendToIndexFile(key NeedleId, offset Offset, size
nm.indexFileAccessLock.Lock() nm.indexFileAccessLock.Lock()
defer nm.indexFileAccessLock.Unlock() defer nm.indexFileAccessLock.Unlock()
if nm.indexFileOffset == 0 { if _, err := nm.indexFile.Seek(0, 2); err != nil {
if fileSize, err := nm.indexFile.Seek(0, 2); err != nil { return fmt.Errorf("cannot seek end of indexfile %s: %v",
return fmt.Errorf("cannot seek end of indexfile %s: %v", nm.indexFile.Name(), err)
nm.indexFile.Name(), err)
} else {
nm.indexFileOffset = fileSize
}
}
written, err := nm.indexFile.WriteAt(bytes, nm.indexFileOffset)
if err == nil {
nm.indexFileOffset += int64(written)
} }
_, err := nm.indexFile.Write(bytes)
return err return err
} }