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

refactoring

Browse source
This commit is contained in:
Chris Lu 2019-01-05 15:16:39 -08:00
parent 251b596bc5
commit d9f9aca453
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
weed/filesys/file.go
View file

@ -173,3 +173,18 @@ func (file *File) maybeLoadAttributes(ctx context.Context) error {
} }
return nil return nil
} }
func (file *File) addChunk(chunk *filer_pb.FileChunk) {
if chunk != nil {
file.addChunks([]*filer_pb.FileChunk{chunk})
}
}
func (file *File) addChunks(chunks []*filer_pb.FileChunk) {
for _, chunk := range chunks {
file.entry.Chunks = append(file.entry.Chunks, chunk)
file.entryViewCache = nil
glog.V(4).Infof("uploaded %s/%s to %s [%d,%d)", file.dir.Path, file.Name, chunk.FileId, chunk.Offset, chunk.Offset+int64(chunk.Size))
}
file.entryViewCache = filer2.NonOverlappingVisibleIntervals(file.entry.Chunks)
}

15
weed/filesys/filehandle.go
View file

@ -157,10 +157,9 @@ func (fh *FileHandle) Write(ctx context.Context, req *fuse.WriteRequest, resp *f
fh.dirtyMetadata = true fh.dirtyMetadata = true
} }
for _, chunk := range chunks { fh.f.addChunks(chunks)
fh.f.entry.Chunks = append(fh.f.entry.Chunks, chunk)
fh.f.entryViewCache = nil if len(chunks) > 0 {
glog.V(4).Infof("uploaded %s/%s to %s [%d,%d)", fh.f.dir.Path, fh.f.Name, chunk.FileId, chunk.Offset, chunk.Offset+int64(chunk.Size))
fh.dirtyMetadata = true fh.dirtyMetadata = true
} }
@ -190,10 +189,8 @@ func (fh *FileHandle) Flush(ctx context.Context, req *fuse.FlushRequest) error {
glog.Errorf("flush %s/%s: %v", fh.f.dir.Path, fh.f.Name, err) glog.Errorf("flush %s/%s: %v", fh.f.dir.Path, fh.f.Name, err)
return fmt.Errorf("flush %s/%s: %v", fh.f.dir.Path, fh.f.Name, err) return fmt.Errorf("flush %s/%s: %v", fh.f.dir.Path, fh.f.Name, err)
} }
if chunk != nil {
fh.f.entry.Chunks = append(fh.f.entry.Chunks, chunk) fh.f.addChunk(chunk)
fh.f.entryViewCache = nil
}
if !fh.dirtyMetadata { if !fh.dirtyMetadata {
return nil return nil
@ -222,7 +219,7 @@ func (fh *FileHandle) Flush(ctx context.Context, req *fuse.FlushRequest) error {
chunks, garbages := filer2.CompactFileChunks(fh.f.entry.Chunks) chunks, garbages := filer2.CompactFileChunks(fh.f.entry.Chunks)
fh.f.entry.Chunks = chunks fh.f.entry.Chunks = chunks
fh.f.entryViewCache = nil // fh.f.entryViewCache = nil
fh.f.wfs.asyncDeleteFileChunks(garbages) fh.f.wfs.asyncDeleteFileChunks(garbages)
if _, err := client.CreateEntry(ctx, request); err != nil { if _, err := client.CreateEntry(ctx, request); err != nil {