mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-31 01:10:41 +01:00
webdav: answer 204 to a PUT that replaces a file (#12233)
* webdav: answer 204 to a PUT that replaces a file * webdav: decide the 204 from what OpenFile actually replaced A Stat before the write left a window where a delete or create in between made the status wrong, and it cost a second filer lookup. The OpenFile create path already knows whether it removed an existing entry, so it now marks the request context and the writer maps 201 to 204 only on a real replace. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * test/webdav: cover OpenFile's own put-outcome flag for both create paths Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * webdav: take the put outcome from the create's OldEntry A stat-then-create still races: a second writer landing between the check and the write makes the reported status describe a state the write never saw. The filer decides create-vs-replace under its per-path lock and reports the previous entry in the response's metadata event, so flag the PUT replace from OldEntry instead of a pre-write stat. The in-place update keeps the replaced entry's crtime and inode and reuses the filer's own chunk cleanup, so the separate removeAll goes away, and an exclusive create now defers to the filer's atomic O_EXCL instead of a racy local check. * webdav: send no body with the 204 a replacing PUT answers --------- Co-authored-by: user.email <chrislusf@users.noreply.github.com> Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
2 files changed
+151
-16
No files matched your search
@@ -98,7 +98,30 @@ func (f *createRecordingFiler) LookupDirectoryEntry(_ context.Context, req *file
|
||||
|
||||
func (f *createRecordingFiler) CreateEntry(_ context.Context, req *filer_pb.CreateEntryRequest) (*filer_pb.CreateEntryResponse, error) {
|
||||
f.req = req
|
||||
return &filer_pb.CreateEntryResponse{}, nil
|
||||
p := string(util.NewFullPath(req.Directory, req.Entry.Name))
|
||||
resp := &filer_pb.CreateEntryResponse{}
|
||||
if f.dirs[p] && !req.Entry.IsDirectory {
|
||||
resp.Error = "existing entry is a directory"
|
||||
resp.ErrorCode = filer_pb.FilerError_EXISTING_IS_DIRECTORY
|
||||
return resp, nil
|
||||
}
|
||||
if req.OExcl && (f.files[p] || f.dirs[p]) {
|
||||
resp.Error = "entry already exists"
|
||||
resp.ErrorCode = filer_pb.FilerError_ENTRY_ALREADY_EXISTS
|
||||
return resp, nil
|
||||
}
|
||||
if f.files[p] {
|
||||
resp.MetadataEvent = &filer_pb.SubscribeMetadataResponse{
|
||||
EventNotification: &filer_pb.EventNotification{
|
||||
OldEntry: &filer_pb.Entry{Name: req.Entry.Name},
|
||||
},
|
||||
}
|
||||
}
|
||||
if f.files == nil {
|
||||
f.files = map[string]bool{}
|
||||
}
|
||||
f.files[p] = true
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
func (f *createRecordingFiler) DeleteEntry(_ context.Context, req *filer_pb.DeleteEntryRequest) (*filer_pb.DeleteEntryResponse, error) {
|
||||
@@ -124,6 +147,16 @@ func (f *deleteRecordingFiler) DeleteEntry(_ context.Context, req *filer_pb.Dele
|
||||
return &filer_pb.DeleteEntryResponse{}, nil
|
||||
}
|
||||
|
||||
func (f *deleteRecordingFiler) CreateEntry(_ context.Context, req *filer_pb.CreateEntryRequest) (*filer_pb.CreateEntryResponse, error) {
|
||||
if f.existing != nil && f.existing.IsDirectory && !req.Entry.IsDirectory {
|
||||
return &filer_pb.CreateEntryResponse{
|
||||
Error: "existing entry is a directory",
|
||||
ErrorCode: filer_pb.FilerError_EXISTING_IS_DIRECTORY,
|
||||
}, nil
|
||||
}
|
||||
return &filer_pb.CreateEntryResponse{}, nil
|
||||
}
|
||||
|
||||
func startFakeWebDavFiler(t *testing.T, impl filer_pb.SeaweedFilerServer) pb.ServerAddress {
|
||||
t.Helper()
|
||||
lis, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
@@ -842,6 +875,67 @@ func TestWebDavFileSystem_OpenFile_DoesNotReplaceFolder(t *testing.T) {
|
||||
assert.Nil(t, filer.req)
|
||||
}
|
||||
|
||||
// putOutcomeFS mimics the filer-backed fs: creating over an existing name
|
||||
// marks the request's PUT outcome as a replace.
|
||||
type putOutcomeFS struct {
|
||||
webdav.FileSystem
|
||||
}
|
||||
|
||||
func (f putOutcomeFS) OpenFile(ctx context.Context, name string, flag int, perm os.FileMode) (webdav.File, error) {
|
||||
if flag&os.O_CREATE != 0 {
|
||||
if _, err := f.FileSystem.Stat(ctx, name); err == nil {
|
||||
if replaced, ok := ctx.Value(putOutcomeKey{}).(*bool); ok {
|
||||
*replaced = true
|
||||
}
|
||||
}
|
||||
}
|
||||
return f.FileSystem.OpenFile(ctx, name, flag, perm)
|
||||
}
|
||||
|
||||
func TestCopyMoveGuardHandler_PutStatus(t *testing.T) {
|
||||
fs := putOutcomeFS{FileSystem: webdav.NewMemFS()}
|
||||
h := copyMoveGuardHandler{
|
||||
fs: fs,
|
||||
next: &webdav.Handler{FileSystem: fs, LockSystem: webdav.NewMemLS()},
|
||||
}
|
||||
put := func(body string) *httptest.ResponseRecorder {
|
||||
req := httptest.NewRequest("PUT", "http://x/a.txt", strings.NewReader(body))
|
||||
w := httptest.NewRecorder()
|
||||
h.ServeHTTP(w, req)
|
||||
return w
|
||||
}
|
||||
assert.Equal(t, http.StatusCreated, put("one").Code)
|
||||
w := put("two")
|
||||
assert.Equal(t, http.StatusNoContent, w.Code)
|
||||
assert.Empty(t, w.Body.String(), "a 204 carries no body")
|
||||
}
|
||||
|
||||
// The 204 comes from OpenFile's own bookkeeping: creating over an existing
|
||||
// entry flags the request context, a fresh create does not.
|
||||
func TestWebDavFileSystem_OpenFile_PutOutcomeFlag(t *testing.T) {
|
||||
filer := &createRecordingFiler{files: map[string]bool{"/old.txt": true}}
|
||||
filerAddr := startFakeWebDavFiler(t, filer)
|
||||
fs := &WebDavFileSystem{option: &WebDavOption{
|
||||
Filer: filerAddr,
|
||||
GrpcDialOption: grpc.WithTransportCredentials(insecure.NewCredentials()),
|
||||
}}
|
||||
|
||||
open := func(name string) bool {
|
||||
replaced := new(bool)
|
||||
ctx := context.WithValue(context.Background(), putOutcomeKey{}, replaced)
|
||||
f, err := fs.OpenFile(ctx, name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
|
||||
assert.NoError(t, err)
|
||||
if f != nil {
|
||||
assert.NoError(t, f.Close())
|
||||
}
|
||||
return *replaced
|
||||
}
|
||||
|
||||
assert.True(t, open("/old.txt"))
|
||||
assert.False(t, open("/new.txt"))
|
||||
assert.True(t, open("/new.txt"), "a PUT over the entry the first create made is a replace")
|
||||
}
|
||||
|
||||
type renameRecordingFiler struct {
|
||||
filer_pb.UnimplementedSeaweedFilerServer
|
||||
req *filer_pb.AtomicRenameEntryRequest
|
||||
|
||||
Reference in new issue
Block a user