aboutsummaryrefslogtreecommitdiff
path: root/weed/filesys/filehandle.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-08-23 17:15:12 -0700
committerChris Lu <chris.lu@gmail.com>2020-08-23 17:15:12 -0700
commit51346a5930b3efb556b99b3936b8ac88e87434a9 (patch)
treebe2e86e92baa54c6e2d1f958924c624c8f0d5720 /weed/filesys/filehandle.go
parentc1d1677a2861121b2d1e954b0c700d848bf8ea84 (diff)
downloadseaweedfs-51346a5930b3efb556b99b3936b8ac88e87434a9.tar.xz
seaweedfs-51346a5930b3efb556b99b3936b8ac88e87434a9.zip
always keep the manifest list of chunks
Diffstat (limited to 'weed/filesys/filehandle.go')
-rw-r--r--weed/filesys/filehandle.go9
1 files changed, 2 insertions, 7 deletions
diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go
index 226ade962..db3e7d10e 100644
--- a/weed/filesys/filehandle.go
+++ b/weed/filesys/filehandle.go
@@ -253,12 +253,7 @@ func (fh *FileHandle) doFlush(ctx context.Context, header fuse.Header) error {
glog.V(4).Infof("%s chunks %d: %v [%d,%d)", fh.f.fullpath(), i, chunk.GetFileIdString(), chunk.Offset, chunk.Offset+int64(chunk.Size))
}
- var nonManifestChunks []*filer_pb.FileChunk
- for _, c := range fh.f.entry.Chunks {
- if !c.IsChunkManifest {
- nonManifestChunks = append(nonManifestChunks, c)
- }
- }
+ manifestChunks, nonManifestChunks := filer2.SeparateManifestChunks(fh.f.entry.Chunks)
chunks, _ := filer2.CompactFileChunks(filer2.LookupFn(fh.f.wfs), nonManifestChunks)
chunks, manifestErr := filer2.MaybeManifestize(fh.f.wfs.saveDataAsChunk(fh.f.dir.FullPath()), chunks)
@@ -266,7 +261,7 @@ func (fh *FileHandle) doFlush(ctx context.Context, header fuse.Header) error {
// not good, but should be ok
glog.V(0).Infof("MaybeManifestize: %v", manifestErr)
}
- fh.f.entry.Chunks = append(chunks, nonManifestChunks...)
+ fh.f.entry.Chunks = append(chunks, manifestChunks...)
fh.f.entryViewCache = nil
if err := filer_pb.CreateEntry(client, request); err != nil {