diff options
| -rw-r--r-- | weed/filer2/filer.go | 2 | ||||
| -rw-r--r-- | weed/filer2/filer_deletion.go | 6 | ||||
| -rw-r--r-- | weed/server/filer_grpc_server.go | 6 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write_autochunk.go | 1 |
5 files changed, 9 insertions, 8 deletions
diff --git a/weed/filer2/filer.go b/weed/filer2/filer.go index faf9b9bca..6b784e0b2 100644 --- a/weed/filer2/filer.go +++ b/weed/filer2/filer.go @@ -246,7 +246,7 @@ func (f *Filer) DeleteEntryMetaAndData(ctx context.Context, p FullPath, isRecurs } if shouldDeleteChunks { - f.DeleteChunks(entry.Chunks) + f.DeleteChunks(p, entry.Chunks) } if p == "/" { diff --git a/weed/filer2/filer_deletion.go b/weed/filer2/filer_deletion.go index c7d02657d..590df6a8d 100644 --- a/weed/filer2/filer_deletion.go +++ b/weed/filer2/filer_deletion.go @@ -51,7 +51,7 @@ func (f *Filer) loopProcessingDeletion() { } } -func (f *Filer) DeleteChunks(chunks []*filer_pb.FileChunk) { +func (f *Filer) DeleteChunks(fullpath FullPath, chunks []*filer_pb.FileChunk) { for _, chunk := range chunks { f.fileIdDeletionChan <- chunk.FileId } @@ -67,7 +67,7 @@ func (f *Filer) deleteChunksIfNotNew(oldEntry, newEntry *Entry) { return } if newEntry == nil { - f.DeleteChunks(oldEntry.Chunks) + f.DeleteChunks(oldEntry.FullPath, oldEntry.Chunks) } var toDelete []*filer_pb.FileChunk @@ -84,5 +84,5 @@ func (f *Filer) deleteChunksIfNotNew(oldEntry, newEntry *Entry) { toDelete = append(toDelete, oldChunk) } } - f.DeleteChunks(toDelete) + f.DeleteChunks(oldEntry.FullPath, toDelete) } diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index c9cb6dbe7..1c2d95e1f 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -114,7 +114,7 @@ func (fs *FilerServer) CreateEntry(ctx context.Context, req *filer_pb.CreateEntr fullpath := filer2.FullPath(filepath.ToSlash(filepath.Join(req.Directory, req.Entry.Name))) chunks, garbages := filer2.CompactFileChunks(req.Entry.Chunks) - fs.filer.DeleteChunks(garbages) + fs.filer.DeleteChunks(fullpath, garbages) if req.Entry.Attributes == nil { return nil, fmt.Errorf("can not create entry with empty attributes") @@ -175,8 +175,8 @@ func (fs *FilerServer) UpdateEntry(ctx context.Context, req *filer_pb.UpdateEntr } if err = fs.filer.UpdateEntry(ctx, entry, newEntry); err == nil { - fs.filer.DeleteChunks(unusedChunks) - fs.filer.DeleteChunks(garbages) + fs.filer.DeleteChunks(entry.FullPath, unusedChunks) + fs.filer.DeleteChunks(entry.FullPath, garbages) } fs.filer.NotifyUpdateEvent(entry, newEntry, true) diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 92f5f19b6..e6fe9af76 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -206,7 +206,7 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request) { } // glog.V(4).Infof("saving %s => %+v", path, entry) if db_err := fs.filer.CreateEntry(ctx, entry); db_err != nil { - fs.filer.DeleteFileByFileId(fileId) + fs.filer.DeleteChunks(entry.FullPath, entry.Chunks) glog.V(0).Infof("failing to write %s to filer server : %v", path, db_err) writeJsonError(w, r, http.StatusInternalServerError, db_err) return diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go index 112f46c0c..7da6aab04 100644 --- a/weed/server/filer_server_handlers_write_autochunk.go +++ b/weed/server/filer_server_handlers_write_autochunk.go @@ -170,6 +170,7 @@ func (fs *FilerServer) doAutoChunk(ctx context.Context, w http.ResponseWriter, r Chunks: fileChunks, } if db_err := fs.filer.CreateEntry(ctx, entry); db_err != nil { + fs.filer.DeleteChunks(entry.FullPath, entry.Chunks) replyerr = db_err filerResult.Error = db_err.Error() glog.V(0).Infof("failing to write %s to filer server : %v", path, db_err) |