mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-31 17:30:42 +01:00
* s3tables: refuse a create that a namespace delete can lose DeleteNamespace checks the namespace for children and then deletes its directory recursively in a second filer call. The filer locks each path on its own, so a table created under the namespace between the two is not seen by the check and is removed by the delete, while both requests answer 200. The mirror case loses the table too: a create that passed its namespace check before the delete finished re-created the namespace directory through the filer's parent creation and recorded a table in a namespace that no longer exists. Each side now writes before it reads. DeleteNamespace claims the namespace record with a fresh token before it scans, deletes only while the record still holds that claim, and lifts its own claim when it stops. CreateTable, RegisterTable and CreateView re-read the namespace after writing their record and back out when it is claimed or gone: they remove what they wrote and answer 409 or 404 instead of reporting an entry that does not survive, or 500 when the record could not be removed and may remain. An entry the scan missed was written after the claim, so its create sees the claim; a create and a delete can both fail, but no longer both succeed. A create is also refused up front while a claim is held, but only after its authorization check, so a caller that may not create there does not learn of the delete. A create writes its record marked "create" and lifts the mark once the namespace is confirmed open. Until then GetTable, GetView, UpdateTable and a second create treat the record as absent, so no request is told about a table or view that the first create may still back out. * s3tables: keep a create's unfinished record out of reads and listings * s3tables: refuse catalog writes on a record an operation claimed * s3tables: answer 404 when a create's write path loses the namespace * s3tables: confirm the rename destination's namespace like a create * s3tables: cover unfinished-record reads, claimed-record writes, rename claim * s3tables: lift a leftover claim when a no-token delete clears the record * s3tables: answer 409 when a claimed record turns away a write UpdateView, TagResource, and UntagResource surfaced ErrConcurrentUpdate as a 500, so an expected conflict looked like a server fault to the caller. Map it to Conflict the way UpdateTable and the policy handlers already do. * s3tables: name the lost source when a rename finds it deleted * s3tables: report an entry deleted before its update as not found The filer answers an UpdateEntry on an entry removed since the lookup with codes.NotFound. mutateEntryExtended returned that error unchanged instead of filer_pb.ErrNotFound, so a rename whose source was deleted mid-claim answered 500 instead of NoSuchTable or NoSuchView. MemFiler now answers a missing entry the same way, so the rename tests for tables and views take the real filer's path. * s3tables: unpublish the destination when a rename's source clear fails * s3tables: refuse to delete a record another operation claimed * s3tables: release catalog claims on an uncanceled cleanup context * s3tables: answer 404 when a racing delete already removed the table * s3tables: keep the rename destination marked until the source clears * s3tables: guard the rename rollback against a recreated source and an unfinished destination * s3tables: drop the unfinished destination only once the source is restored * s3tables: re-resolve the purge target on the record a delete claims * s3tables: cover a delete that meets a moved metadata location * s3tables: answer 409 when a create's record changed under it * s3tables: adopt a record still marked by its unfinished create * s3tables: skip unfinished creates in the namespace empty check * s3tables: delete only the record the caller was authorized on DeleteView and DeleteTable check permissions on the record they read first, then read the name again to claim it. A record that took the name in between, such as a table or another owner's view created after a concurrent delete, was claimed and removed on the first record's authorization, and DeleteView never compared the caller's version token with it. The second read now repeats the first one's checks: a record of the other kind or an unfinished create answers 404, and a token that no longer matches answers 409. A delete without a token also compares the record's version token with the authorized one and answers 409 when they differ. * s3tables: re-check the parent after a create lifts its mark A create that passed checkParentOpen and paused before lifting its mark could still confirm while a namespace delete held the claim: the delete scans the still-marked record, skips it, and removes it under a create that already answered success. confirmParent now re-reads the same parent record after the mark clears and backs the confirmed record out when the namespace moved on. * s3tables: mark the rename destination with a claim of its own claimCatalogEntry adopted every create-marked record, including a rename's destination: a create landing after the source cleared could replace the destination before the rename published it, and with the source name reused the restore could leave the table on neither name. The destination now marks with the rename's own claim, which readers still treat as unpublished but a create must refuse, and the commit re-checks the destination namespace after the record goes live. The source keeps its rename claim until the commit lands so a namespace delete scanning the cleared record still refuses. * s3tables: compare the parent's createdAt, not its editable metadata A namespace update rewrites ExtendedKeyMetadata in place, so a create or rename whose second parent read landed across an UpdateNamespace saw a changed blob and reported the still-live namespace as gone: creates backed their record out and answered 404, renames undid their destination. createdAt survives the edit but changes on a delete+recreate, so it still identifies the record. * s3tables: retry lifting the rename's claim off the cleared source The release's only failure mode is a transient filer error — nothing else can write the cleared record — yet a single loss left the claim behind: the old name stayed refused to creates and the namespace counted the record as a child. Retry the release before warning. * s3tables: page the namespace scan before deleting it A page of skippable entries — bare directories or unfinished creates — ended the scan with hasChildren false, so a table on a later page was removed with the namespace. Keep listing with StartFromFileName until a child shows or the listing ends. --------- Co-authored-by: chrislusf <chrislusf@users.noreply.github.com>
265 lines
8.9 KiB
Go
265 lines
8.9 KiB
Go
package s3tables
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3tables/s3tablestest"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/grpc"
|
|
)
|
|
|
|
// pausedLookupClient holds the first lookup of dir/name until release is
|
|
// closed, after closing reached. A delete reads the table bucket between the
|
|
// read that authorizes it and the read that claims the record, so holding that
|
|
// lookup lands another request exactly there.
|
|
type pausedLookupClient struct {
|
|
filer_pb.SeaweedFilerClient
|
|
dir string
|
|
name string
|
|
reached chan struct{}
|
|
release chan struct{}
|
|
once sync.Once
|
|
}
|
|
|
|
func newPausedLookupClient(client filer_pb.SeaweedFilerClient, dir, name string) *pausedLookupClient {
|
|
return &pausedLookupClient{
|
|
SeaweedFilerClient: client,
|
|
dir: dir,
|
|
name: name,
|
|
reached: make(chan struct{}),
|
|
release: make(chan struct{}),
|
|
}
|
|
}
|
|
|
|
func (c *pausedLookupClient) LookupDirectoryEntry(ctx context.Context, req *filer_pb.LookupDirectoryEntryRequest, opts ...grpc.CallOption) (*filer_pb.LookupDirectoryEntryResponse, error) {
|
|
if req.Directory == c.dir && req.Name == c.name {
|
|
c.once.Do(func() {
|
|
close(c.reached)
|
|
<-c.release
|
|
})
|
|
}
|
|
return c.SeaweedFilerClient.LookupDirectoryEntry(ctx, req, opts...)
|
|
}
|
|
|
|
func createViewRequest(t *testing.T, name string) *CreateViewRequest {
|
|
return &CreateViewRequest{
|
|
TableBucketARN: mustBucketARN(t),
|
|
Namespace: []string{"ns"},
|
|
Name: name,
|
|
MetadataLocation: "s3://" + renameTestBucket + "/ns/" + name + "/metadata/v1.metadata.json",
|
|
}
|
|
}
|
|
|
|
func deleteViewRequest(t *testing.T, name, token string) *DeleteViewRequest {
|
|
return &DeleteViewRequest{
|
|
TableBucketARN: mustBucketARN(t),
|
|
Namespace: []string{"ns"},
|
|
Name: name,
|
|
VersionToken: token,
|
|
}
|
|
}
|
|
|
|
func deleteTableRequest(t *testing.T, name string) *DeleteTableRequest {
|
|
return &DeleteTableRequest{
|
|
TableBucketARN: mustBucketARN(t),
|
|
Namespace: []string{"ns"},
|
|
Name: name,
|
|
}
|
|
}
|
|
|
|
func getViewRequest(t *testing.T, name string) *GetViewRequest {
|
|
return &GetViewRequest{
|
|
TableBucketARN: mustBucketARN(t),
|
|
Namespace: []string{"ns"},
|
|
Name: name,
|
|
}
|
|
}
|
|
|
|
func getTableRequest(t *testing.T, name string) *GetTableRequest {
|
|
return &GetTableRequest{
|
|
TableBucketARN: mustBucketARN(t),
|
|
Namespace: []string{"ns"},
|
|
Name: name,
|
|
}
|
|
}
|
|
|
|
// versionTokenOf returns the token the record under name carries.
|
|
func versionTokenOf(t *testing.T, fs *s3tablestest.MemFiler, name string) string {
|
|
t.Helper()
|
|
entry := fs.Get(GetNamespacePath(renameTestBucket, "ns"), name)
|
|
require.NotNil(t, entry)
|
|
var metadata tableMetadataInternal
|
|
require.NoError(t, json.Unmarshal(entry.Extended[ExtendedKeyMetadata], &metadata))
|
|
return metadata.VersionToken
|
|
}
|
|
|
|
// requireOK runs an operation that has to succeed.
|
|
func requireOK(t *testing.T, m *Manager, fs *s3tablestest.MemFiler, operation string, input interface{}) {
|
|
t.Helper()
|
|
status, resp := runHandler(t, m, fs.Client, operation, input)
|
|
require.Equal(t, http.StatusOK, status, "%s: %+v", operation, resp)
|
|
}
|
|
|
|
// A delete authorized on one record must not remove a record that took its name
|
|
// afterwards. Another delete removes the view and a create reuses the name while
|
|
// the first delete is held between its two reads.
|
|
func TestDeleteViewSparesAReplacement(t *testing.T) {
|
|
const name = "v"
|
|
cases := []struct {
|
|
name string
|
|
replace func(t *testing.T, m *Manager, fs *s3tablestest.MemFiler)
|
|
withToken bool
|
|
wantStatus int
|
|
wantType string
|
|
wantMessage string
|
|
read string
|
|
readInput func(t *testing.T) interface{}
|
|
}{
|
|
{
|
|
name: "table without token",
|
|
replace: func(t *testing.T, m *Manager, fs *s3tablestest.MemFiler) {
|
|
requireOK(t, m, fs, "CreateTable", createTableRequest(t, "ns", name))
|
|
},
|
|
wantStatus: http.StatusNotFound,
|
|
wantType: ErrCodeNoSuchView,
|
|
read: "GetTable",
|
|
readInput: func(t *testing.T) interface{} { return getTableRequest(t, name) },
|
|
},
|
|
{
|
|
name: "view with the old token",
|
|
replace: func(t *testing.T, m *Manager, fs *s3tablestest.MemFiler) {
|
|
requireOK(t, m, fs, "CreateView", createViewRequest(t, name))
|
|
},
|
|
withToken: true,
|
|
wantStatus: http.StatusConflict,
|
|
wantType: ErrCodeConflict,
|
|
wantMessage: "version token mismatch",
|
|
read: "GetView",
|
|
readInput: func(t *testing.T) interface{} { return getViewRequest(t, name) },
|
|
},
|
|
{
|
|
name: "view without token",
|
|
replace: func(t *testing.T, m *Manager, fs *s3tablestest.MemFiler) {
|
|
requireOK(t, m, fs, "CreateView", createViewRequest(t, name))
|
|
},
|
|
wantStatus: http.StatusConflict,
|
|
wantType: ErrCodeConflict,
|
|
wantMessage: "changed during delete",
|
|
read: "GetView",
|
|
readInput: func(t *testing.T) interface{} { return getViewRequest(t, name) },
|
|
},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
fs, m := startRenameManager(t)
|
|
requireOK(t, m, fs, "CreateView", createViewRequest(t, name))
|
|
oldToken := versionTokenOf(t, fs, name)
|
|
token := ""
|
|
if tc.withToken {
|
|
token = oldToken
|
|
}
|
|
|
|
client := newPausedLookupClient(fs.Client, TablesPath, renameTestBucket)
|
|
deleted := startHandler(t, m, client, "DeleteView", deleteViewRequest(t, name, token))
|
|
waitForPause(t, client.reached, deleted)
|
|
|
|
requireOK(t, m, fs, "DeleteView", deleteViewRequest(t, name, ""))
|
|
tc.replace(t, m, fs)
|
|
close(client.release)
|
|
|
|
got := <-deleted
|
|
assert.Equal(t, tc.wantStatus, got.status, "%+v", got.resp)
|
|
assert.Equal(t, tc.wantType, got.resp.Type)
|
|
assert.Contains(t, got.resp.Message, tc.wantMessage)
|
|
|
|
status, resp := runHandler(t, m, fs.Client, tc.read, tc.readInput(t))
|
|
assert.Equal(t, http.StatusOK, status, "the replacement must survive: %+v", resp)
|
|
survivor := fs.Get(GetNamespacePath(renameTestBucket, "ns"), name)
|
|
require.NotNil(t, survivor)
|
|
assert.NotContains(t, survivor.Extended, ExtendedKeyDeleting, "a refused delete must not leave its claim")
|
|
})
|
|
}
|
|
}
|
|
|
|
// The same gap in DeleteTable: a view that takes the table's name while the
|
|
// delete is held between its reads is not the record the delete authorized.
|
|
func TestDeleteTableSparesAReplacementView(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
// seed makes the table to delete and returns its name and the location
|
|
// the replacement view points at, so a delete that wrongly took the view
|
|
// would purge from there.
|
|
seed func(fs *s3tablestest.MemFiler) (name, location string)
|
|
}{
|
|
{
|
|
name: "colocated",
|
|
seed: func(fs *s3tablestest.MemFiler) (string, string) {
|
|
return "t", "s3://" + renameTestBucket + "/ns/t/metadata/v3.metadata.json"
|
|
},
|
|
},
|
|
{
|
|
name: "decoupled",
|
|
seed: func(fs *s3tablestest.MemFiler) (string, string) {
|
|
location := "s3://" + renameTestBucket + "/ns/dt-x/metadata/v1.metadata.json"
|
|
meta, _ := json.Marshal(tableMetadataInternal{
|
|
Name: "dt",
|
|
Namespace: "ns",
|
|
Format: "ICEBERG",
|
|
OwnerAccountID: DefaultAccountID,
|
|
MetadataLocation: location,
|
|
})
|
|
fs.Put(GetNamespacePath(renameTestBucket, "ns"), "dt", map[string][]byte{
|
|
ExtendedKeyMetadata: meta,
|
|
ExtendedKeyEntryType: []byte(EntryTypeTable),
|
|
})
|
|
fs.Put(GetNamespacePath(renameTestBucket, "ns"), "dt-x", nil)
|
|
fs.Put(GetTablePath(renameTestBucket, "ns", "dt-x"), "metadata", nil)
|
|
return "dt", location
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
fs, m := startRenameManager(t)
|
|
name, location := tc.seed(fs)
|
|
|
|
client := newPausedLookupClient(fs.Client, TablesPath, renameTestBucket)
|
|
deleted := startHandler(t, m, client, "DeleteTable", deleteTableRequest(t, name))
|
|
waitForPause(t, client.reached, deleted)
|
|
|
|
requireOK(t, m, fs, "DeleteTable", deleteTableRequest(t, name))
|
|
// CreateView refuses a name that a decoupled delete left a directory
|
|
// on, so the replacement is put the way a create leaves it.
|
|
viewMeta, _ := json.Marshal(tableMetadataInternal{
|
|
Name: name,
|
|
Namespace: "ns",
|
|
Format: "ICEBERG",
|
|
OwnerAccountID: DefaultAccountID,
|
|
VersionToken: "replacement-token",
|
|
MetadataLocation: location,
|
|
})
|
|
fs.Put(GetNamespacePath(renameTestBucket, "ns"), name, map[string][]byte{
|
|
ExtendedKeyMetadata: viewMeta,
|
|
ExtendedKeyEntryType: []byte(EntryTypeView),
|
|
})
|
|
close(client.release)
|
|
|
|
got := <-deleted
|
|
assert.Equal(t, http.StatusNotFound, got.status, "%+v", got.resp)
|
|
assert.Equal(t, ErrCodeNoSuchTable, got.resp.Type)
|
|
|
|
status, resp := runHandler(t, m, fs.Client, "GetView", getViewRequest(t, name))
|
|
assert.Equal(t, http.StatusOK, status, "the replacement view must survive: %+v", resp)
|
|
survivor := fs.Get(GetNamespacePath(renameTestBucket, "ns"), name)
|
|
require.NotNil(t, survivor)
|
|
assert.NotContains(t, survivor.Extended, ExtendedKeyDeleting, "a refused delete must not leave its claim")
|
|
})
|
|
}
|
|
}
|