diff options
| author | Chris Lu <chris.lu@uber.com> | 2019-03-15 15:26:09 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@uber.com> | 2019-03-15 15:26:09 -0700 |
| commit | 55c85f3a66fce8ba2d8613fc3fd2b0de1ca46bde (patch) | |
| tree | 3a5b68a29bf88c09979fd68af8c5d0f57e2b83fa | |
| parent | d30600e6d6b44101525d208b213a6c37bdfdba9e (diff) | |
| download | seaweedfs-55c85f3a66fce8ba2d8613fc3fd2b0de1ca46bde.tar.xz seaweedfs-55c85f3a66fce8ba2d8613fc3fd2b0de1ca46bde.zip | |
adding context
| -rw-r--r-- | weed/filer2/filer.go | 4 | ||||
| -rw-r--r-- | weed/filer2/memdb/memdb_store_test.go | 3 | ||||
| -rw-r--r-- | weed/server/filer_grpc_server.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/weed/filer2/filer.go b/weed/filer2/filer.go index eae1107ca..50df3fc0b 100644 --- a/weed/filer2/filer.go +++ b/weed/filer2/filer.go @@ -187,7 +187,7 @@ func (f *Filer) FindEntry(p FullPath) (entry *Entry, err error) { return f.store.FindEntry(p) } -func (f *Filer) DeleteEntryMetaAndData(p FullPath, isRecursive bool, shouldDeleteChunks bool) (err error) { +func (f *Filer) DeleteEntryMetaAndData(ctx context.Context, p FullPath, isRecursive bool, shouldDeleteChunks bool) (err error) { entry, err := f.FindEntry(p) if err != nil { return err @@ -211,7 +211,7 @@ func (f *Filer) DeleteEntryMetaAndData(p FullPath, isRecursive bool, shouldDelet if isRecursive { for _, sub := range entries { lastFileName = sub.Name() - f.DeleteEntryMetaAndData(sub.FullPath, isRecursive, shouldDeleteChunks) + f.DeleteEntryMetaAndData(ctx, sub.FullPath, isRecursive, shouldDeleteChunks) limit-- if limit <= 0 { break diff --git a/weed/filer2/memdb/memdb_store_test.go b/weed/filer2/memdb/memdb_store_test.go index 31da8998f..53a5ab94d 100644 --- a/weed/filer2/memdb/memdb_store_test.go +++ b/weed/filer2/memdb/memdb_store_test.go @@ -1,6 +1,7 @@ package memdb import ( + "context" "github.com/chrislusf/seaweedfs/weed/filer2" "testing" ) @@ -134,7 +135,7 @@ func TestCreateFileAndList(t *testing.T) { } // delete file and count - filer.DeleteEntryMetaAndData(file3Path, false, false) + filer.DeleteEntryMetaAndData(context.Background(), file3Path, false, false) entries, _ = filer.ListDirectoryEntries(filer2.FullPath("/home/chris/this/is"), "", false, 100) if len(entries) != 1 { t.Errorf("list entries count: %v", len(entries)) diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index d593a425e..38c9135be 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -186,7 +186,7 @@ func (fs *FilerServer) UpdateEntry(ctx context.Context, req *filer_pb.UpdateEntr } func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer_pb.DeleteEntryRequest) (resp *filer_pb.DeleteEntryResponse, err error) { - err = fs.filer.DeleteEntryMetaAndData(filer2.FullPath(filepath.ToSlash(filepath.Join(req.Directory, req.Name))), req.IsRecursive, req.IsDeleteData) + err = fs.filer.DeleteEntryMetaAndData(ctx, filer2.FullPath(filepath.ToSlash(filepath.Join(req.Directory, req.Name))), req.IsRecursive, req.IsDeleteData) return &filer_pb.DeleteEntryResponse{}, err } diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 9e231c645..737798a7e 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -1,6 +1,7 @@ package weed_server import ( + "context" "encoding/json" "errors" "io/ioutil" @@ -218,7 +219,7 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { isRecursive := r.FormValue("recursive") == "true" - err := fs.filer.DeleteEntryMetaAndData(filer2.FullPath(r.URL.Path), isRecursive, true) + err := fs.filer.DeleteEntryMetaAndData(context.Background(), filer2.FullPath(r.URL.Path), isRecursive, true) if err != nil { glog.V(1).Infoln("deleting", r.URL.Path, ":", err.Error()) writeJsonError(w, r, http.StatusInternalServerError, err) |