c909724bf1
* Fix: prevent panic when swap file creation fails * weed mount: fix race condition in swap file initialization Ensure thread-safe access to sf.file and other state in NewSwapFileChunk and FreeResource by using sf.chunkTrackingLock consistently. Also set sf.file to nil after closing to prevent reuse. * weed mount: improve swap directory creation logic - Check error for os.MkdirAll and log it if it fails. - Use 0700 permissions for the swap directory for better security. - Improve error logging context. * weed mount: add unit tests for swap file creation Add tests to verify: - Concurrent initialization of the swap file. - Correct directory permissions (0700). - Automatic directory recreation if deleted. * weed mount: fix thread-safety in swap file unit tests Use atomic.Uint32 to track failures within goroutines in TestSwapFile_NewSwapFileChunk_Concurrent to avoid unsafe calls to t.Errorf from multiple goroutines. * weed mount: simplify swap file creation logic Refactor the directory check and retry logic for better readability and to avoid re-using the main error variable for directory creation errors. Remove redundant error logging. * weed mount: improve error checking in swap file tests Explicitly check if NewSwapFileChunk returns nil to provide more informative failures. * weed mount: update DirtyPages interface to return error Propagate errors from SaveDataAt when swap file creation fails. This prevents potential panics in the write path. * weed mount: handle AddPage errors in write paths Update ChunkedDirtyPages and PageWriter to propagate errors and update WFS.Write and WFS.CopyFileRange to return fuse.EIO on failure. * weed mount: update swap directory creation error message Change "recreate" to "create/recreate" to better reflect that this path is also taken during the initial creation of the swap directory. --------- Co-authored-by: lixiang58 <lixiang58@lenovo.com> Co-authored-by: Chris Lu <chris.lu@gmail.com>
96 lines
2.3 KiB
Go
96 lines
2.3 KiB
Go
package mount
|
|
|
|
import (
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/mount/page_writer"
|
|
)
|
|
|
|
type PageWriter struct {
|
|
fh *FileHandle
|
|
collection string
|
|
replication string
|
|
chunkSize int64
|
|
writerPattern *WriterPattern
|
|
|
|
randomWriter page_writer.DirtyPages
|
|
}
|
|
|
|
var (
|
|
_ = page_writer.DirtyPages(&PageWriter{})
|
|
)
|
|
|
|
func newPageWriter(fh *FileHandle, chunkSize int64) *PageWriter {
|
|
pw := &PageWriter{
|
|
fh: fh,
|
|
chunkSize: chunkSize,
|
|
writerPattern: NewWriterPattern(chunkSize),
|
|
randomWriter: newMemoryChunkPages(fh, chunkSize),
|
|
}
|
|
return pw
|
|
}
|
|
|
|
func (pw *PageWriter) AddPage(offset int64, data []byte, isSequential bool, tsNs int64) error {
|
|
|
|
glog.V(4).Infof("%v AddPage [%d, %d)", pw.fh.fh, offset, offset+int64(len(data)))
|
|
|
|
chunkIndex := offset / pw.chunkSize
|
|
for i := chunkIndex; len(data) > 0; i++ {
|
|
writeSize := min(int64(len(data)), (i+1)*pw.chunkSize-offset)
|
|
if err := pw.addToOneChunk(i, offset, data[:writeSize], isSequential, tsNs); err != nil {
|
|
return err
|
|
}
|
|
offset += writeSize
|
|
data = data[writeSize:]
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (pw *PageWriter) addToOneChunk(chunkIndex, offset int64, data []byte, isSequential bool, tsNs int64) error {
|
|
return pw.randomWriter.AddPage(offset, data, isSequential, tsNs)
|
|
}
|
|
|
|
func (pw *PageWriter) FlushData() error {
|
|
return pw.randomWriter.FlushData()
|
|
}
|
|
|
|
func (pw *PageWriter) ReadDirtyDataAt(data []byte, offset int64, tsNs int64) (maxStop int64) {
|
|
glog.V(4).Infof("ReadDirtyDataAt %v [%d, %d)", pw.fh.inode, offset, offset+int64(len(data)))
|
|
|
|
chunkIndex := offset / pw.chunkSize
|
|
for i := chunkIndex; len(data) > 0; i++ {
|
|
readSize := min(int64(len(data)), (i+1)*pw.chunkSize-offset)
|
|
|
|
maxStop = pw.randomWriter.ReadDirtyDataAt(data[:readSize], offset, tsNs)
|
|
|
|
offset += readSize
|
|
data = data[readSize:]
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (pw *PageWriter) LockForRead(startOffset, stopOffset int64) {
|
|
pw.randomWriter.LockForRead(startOffset, stopOffset)
|
|
}
|
|
|
|
func (pw *PageWriter) UnlockForRead(startOffset, stopOffset int64) {
|
|
pw.randomWriter.UnlockForRead(startOffset, stopOffset)
|
|
}
|
|
|
|
func (pw *PageWriter) Destroy() {
|
|
pw.randomWriter.Destroy()
|
|
}
|
|
|
|
func max(x, y int64) int64 {
|
|
if x > y {
|
|
return x
|
|
}
|
|
return y
|
|
}
|
|
func min(x, y int64) int64 {
|
|
if x < y {
|
|
return x
|
|
}
|
|
return y
|
|
}
|