1 files changed, 52 insertions, 57 deletions

diff --git a/weed/mount/filehandle.go b/weed/mount/filehandle.go
index b6ec3d2da..67298b047 100644
--- a/weed/mount/filehandle.go
+++ b/weed/mount/filehandle.go
@@ -5,50 +5,60 @@ import (
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
 	"github.com/seaweedfs/seaweedfs/weed/util"
-	"golang.org/x/exp/slices"
-	"golang.org/x/sync/semaphore"
-	"math"
+	"os"
 	"sync"
 )
 
 type FileHandleId uint64
 
+var IsDebugFileReadWrite = false
+
 type FileHandle struct {
-	fh        FileHandleId
-	counter   int64
-	entry     *LockedEntry
-	entryLock sync.Mutex
-	inode     uint64
-	wfs       *WFS
+	fh              FileHandleId
+	counter         int64
+	entry           *LockedEntry
+	entryLock       sync.Mutex
+	entryChunkGroup *filer.ChunkGroup
+	inode           uint64
+	wfs             *WFS
 
 	// cache file has been written to
-	dirtyMetadata  bool
-	dirtyPages     *PageWriter
-	entryViewCache []filer.VisibleInterval
-	reader         *filer.ChunkReadAt
-	contentType    string
-	handle         uint64
-	orderedMutex   *semaphore.Weighted
+	dirtyMetadata bool
+	dirtyPages    *PageWriter
+	reader        *filer.ChunkReadAt
+	contentType   string
+	handle        uint64
+	sync.Mutex
 
 	isDeleted bool
+
+	// for debugging
+	mirrorFile *os.File
 }
 
 func newFileHandle(wfs *WFS, handleId FileHandleId, inode uint64, entry *filer_pb.Entry) *FileHandle {
 	fh := &FileHandle{
-		fh:           handleId,
-		counter:      1,
-		inode:        inode,
-		wfs:          wfs,
-		orderedMutex: semaphore.NewWeighted(int64(math.MaxInt64)),
+		fh:      handleId,
+		counter: 1,
+		inode:   inode,
+		wfs:     wfs,
 	}
 	// dirtyPages: newContinuousDirtyPages(file, writeOnly),
 	fh.dirtyPages = newPageWriter(fh, wfs.option.ChunkSizeLimit)
-	if entry != nil {
-		entry.Attributes.FileSize = filer.FileSize(entry)
-	}
 	fh.entry = &LockedEntry{
 		Entry: entry,
 	}
+	if entry != nil {
+		fh.SetEntry(entry)
+	}
+
+	if IsDebugFileReadWrite {
+		var err error
+		fh.mirrorFile, err = os.OpenFile("/tmp/sw/"+entry.Name, os.O_RDWR|os.O_CREATE, 0600)
+		if err != nil {
+			println("failed to create mirror:", err.Error())
+		}
+	}
 
 	return fh
 }
@@ -63,6 +73,17 @@ func (fh *FileHandle) GetEntry() *filer_pb.Entry {
 }
 
 func (fh *FileHandle) SetEntry(entry *filer_pb.Entry) {
+	if entry != nil {
+		fileSize := filer.FileSize(entry)
+		entry.Attributes.FileSize = fileSize
+		var resolveManifestErr error
+		fh.entryChunkGroup, resolveManifestErr = filer.NewChunkGroup(fh.wfs.LookupFn(), fh.wfs.chunkCache, entry.Chunks)
+		if resolveManifestErr != nil {
+			glog.Warningf("failed to resolve manifest chunks in %+v", entry)
+		}
+	} else {
+		glog.Fatalf("setting file handle entry to nil")
+	}
 	fh.entry.SetEntry(entry)
 }
 
@@ -78,43 +99,17 @@ func (fh *FileHandle) AddChunks(chunks []*filer_pb.FileChunk) {
 		return
 	}
 
-	// find the earliest incoming chunk
-	newChunks := chunks
-	earliestChunk := newChunks[0]
-	for i := 1; i < len(newChunks); i++ {
-		if lessThan(earliestChunk, newChunks[i]) {
-			earliestChunk = newChunks[i]
-		}
-	}
-
-	// pick out-of-order chunks from existing chunks
-	for _, chunk := range fh.entry.GetChunks() {
-		if lessThan(earliestChunk, chunk) {
-			chunks = append(chunks, chunk)
-		}
-	}
-
-	// sort incoming chunks
-	slices.SortFunc(chunks, func(a, b *filer_pb.FileChunk) bool {
-		return lessThan(a, b)
-	})
-
-	glog.V(4).Infof("%s existing %d chunks adds %d more", fh.FullPath(), len(fh.entry.GetChunks()), len(chunks))
-
-	fh.entry.AppendChunks(newChunks)
-	fh.entryViewCache = nil
+	fh.entry.AppendChunks(chunks)
 }
 
-func (fh *FileHandle) CloseReader() {
-	if fh.reader != nil {
-		_ = fh.reader.Close()
-		fh.reader = nil
-	}
-}
+func (fh *FileHandle) ReleaseHandle() {
+	fh.entryLock.Lock()
+	defer fh.entryLock.Unlock()
 
-func (fh *FileHandle) Release() {
 	fh.dirtyPages.Destroy()
-	fh.CloseReader()
+	if IsDebugFileReadWrite {
+		fh.mirrorFile.Close()
+	}
 }
 
 func lessThan(a, b *filer_pb.FileChunk) bool {