mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-09 21:38:19 +01:00
* s3tables: give a table created without a location its own directory An Iceberg table created without a location kept its files under its name path, so a rename left them where the next table of that name would land. Such a table now gets s3://<bucket>/<namespace>/<name>-<uuid>, stored as the record's warehouseLocation and returned by GetTable; its first commit writes there without moving the root. Records without one keep resolving to their name path, so existing tables need no rewrite. Lance datasets stay at their name path, where Lance clients and the vector engine look for them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: create tables and views in a directory of their own A table or view created without a location took its name path, or a unique one only when that path was already taken. It now always gets <name>-<uuid>, so a later rename never leaves its files under a name another table can take. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: load and commit a table at its warehouse location A table created through S3 Tables without a location has no metadata until its first commit; loading or committing it now uses the directory recorded for it, and only a record without one falls back to its name path. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: fail a stage-create whose marker is not saved The marker is how the commit finds the location the stage-create handed out. Without it the commit fell back to the name path while the client's files sat under the returned location. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: expect tables created without a location in their own directory Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: rename a table that keeps its files elsewhere before reusing its name Enterprise keeps the storage marker on a renamed table's files, so the name of a table whose files sit under its name path stays taken there. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3tables: remove the table directory when a create backs out Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: answer a create that lost the race with the registered table Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: answer a view create that lost the race with the registered view Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: fail a staged commit whose name another create registered Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: remove the directory of a create whose name another table took Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: keep the metadata of a staged commit whose name is taken Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: write the lakekeeper table's data under its warehouse location Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: commit a staged table at the location of its own stage Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: never continue another stage when a commit's own marker is gone Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * iceberg: test filer honors exclusive creates and token-guarded deletes Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
394 lines
16 KiB
Go
394 lines
16 KiB
Go
package iceberg
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/apache/iceberg-go/table"
|
|
"github.com/google/uuid"
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3tables"
|
|
)
|
|
|
|
// CommitTransactionRequest is sent to POST /v1/transactions/commit.
|
|
type CommitTransactionRequest struct {
|
|
TableChanges []tableChangeRequest `json:"table-changes"`
|
|
}
|
|
|
|
type tableChangeRequest struct {
|
|
Identifier *TableIdentifier `json:"identifier"`
|
|
Requirements json.RawMessage `json:"requirements"`
|
|
Updates []json.RawMessage `json:"updates"`
|
|
}
|
|
|
|
// preparedTableCommit holds the per-table work resolved during validation so
|
|
// pointer flips (and their rollback) can run after every table is validated.
|
|
type preparedTableCommit struct {
|
|
namespace []string
|
|
tableName string
|
|
tableUUID uuid.UUID
|
|
versionToken string
|
|
metadataBucket string
|
|
metadataPath string
|
|
location string
|
|
metadataFileName string
|
|
metadataBytes []byte
|
|
metadataVersion int
|
|
newMetadataLoc string
|
|
|
|
// prior table state captured before the flip, so a rollback can revert
|
|
// every field handleUpdateTable would have mutated (not just the location).
|
|
prevMetadataLoc string
|
|
prevMetadataVersion int
|
|
prevMetadata *s3tables.TableMetadata
|
|
}
|
|
|
|
// handleCommitTransaction commits changes to multiple tables in one request.
|
|
// Validation is atomic (all requirements evaluated before any write); pointer
|
|
// flips are best-effort with rollback, so this is not crash-atomic.
|
|
func (s *Server) handleCommitTransaction(w http.ResponseWriter, r *http.Request) {
|
|
bucketName := getBucketFromPrefix(r)
|
|
bucketARN := buildTableBucketARN(bucketName)
|
|
identityName := s3_constants.GetIdentityNameFromContext(r)
|
|
|
|
var req CommitTransactionRequest
|
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
writeError(w, http.StatusBadRequest, "BadRequestException", "Invalid request body: "+err.Error())
|
|
return
|
|
}
|
|
if len(req.TableChanges) == 0 {
|
|
w.WriteHeader(http.StatusNoContent)
|
|
return
|
|
}
|
|
|
|
// Phase 1: resolve, load, and validate every table; build new metadata bytes.
|
|
prepared := make([]preparedTableCommit, 0, len(req.TableChanges))
|
|
for _, change := range req.TableChanges {
|
|
if change.Identifier == nil || len(change.Identifier.Namespace) == 0 || change.Identifier.Name == "" {
|
|
writeError(w, http.StatusBadRequest, "BadRequestException", "Each table change requires identifier namespace and name")
|
|
return
|
|
}
|
|
pc, reqErr := s.prepareTableCommit(r.Context(), bucketName, bucketARN, identityName, change)
|
|
if reqErr != nil {
|
|
writeError(w, reqErr.status, reqErr.errType, reqErr.message)
|
|
return
|
|
}
|
|
prepared = append(prepared, *pc)
|
|
}
|
|
|
|
// Phase 2: write each new metadata.json object. Staging is exclusive for the
|
|
// same reason a single-table commit stages exclusively: a transaction racing
|
|
// another writer on one of its tables would otherwise overwrite that
|
|
// writer's metadata, and the pointer flip below decides who won.
|
|
for i := range prepared {
|
|
pc := &prepared[i]
|
|
fileName, location, err := s.stageCommitMetadata(r.Context(), pc.metadataBucket, pc.metadataPath, pc.location, pc.metadataFileName, pc.metadataBytes)
|
|
if err != nil {
|
|
// No pointer flipped yet, so every written file is safe to delete.
|
|
s.cleanupPreparedMetadata(r.Context(), prepared[:i+1], nil)
|
|
writeError(w, http.StatusInternalServerError, "InternalServerError", "Failed to save metadata file: "+err.Error())
|
|
return
|
|
}
|
|
pc.metadataFileName = fileName
|
|
pc.newMetadataLoc = location
|
|
}
|
|
|
|
// Phase 3: flip each table's pointer xattr; on failure roll back prior flips.
|
|
for i := range prepared {
|
|
pc := &prepared[i]
|
|
if err := s.flipTablePointer(r.Context(), bucketARN, identityName, pc); err != nil {
|
|
rolledBack := s.rollbackTablePointers(r.Context(), bucketARN, identityName, prepared[:i])
|
|
s.cleanupPreparedMetadata(r.Context(), prepared, cleanupSafeMetadata(prepared, i, rolledBack))
|
|
if isS3TablesConflict(err) {
|
|
writeError(w, http.StatusConflict, "CommitFailedException", "Version token mismatch")
|
|
return
|
|
}
|
|
logManagerError("CommitTransaction UpdateTable", err)
|
|
writeManagerError(w, err)
|
|
return
|
|
}
|
|
}
|
|
|
|
w.WriteHeader(http.StatusNoContent)
|
|
}
|
|
|
|
func (s *Server) prepareTableCommit(ctx context.Context, bucketName, bucketARN, identityName string, change tableChangeRequest) (*preparedTableCommit, *icebergRequestError) {
|
|
namespace := []string(change.Identifier.Namespace)
|
|
tableName := change.Identifier.Name
|
|
|
|
requirements, updates, statisticsUpdates, reqErr := parseTableChange(change)
|
|
if reqErr != nil {
|
|
return nil, reqErr
|
|
}
|
|
|
|
getReq := &s3tables.GetTableRequest{TableBucketARN: bucketARN, Namespace: namespace, Name: tableName}
|
|
var getResp s3tables.GetTableResponse
|
|
err := s.filerClient.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
|
|
mgrClient := s3tables.NewManagerClient(client)
|
|
return s.tablesManager.Execute(ctx, mgrClient, "GetTable", getReq, &getResp, identityName)
|
|
})
|
|
if err != nil {
|
|
if isS3TablesNotFound(err) {
|
|
return nil, &icebergRequestError{http.StatusNotFound, "NoSuchTableException", fmt.Sprintf("Table does not exist: %s", tableName)}
|
|
}
|
|
glog.V(1).Infof("Iceberg: CommitTransaction GetTable error: %v", err)
|
|
return nil, &icebergRequestError{http.StatusInternalServerError, "InternalServerError", err.Error()}
|
|
}
|
|
if reqErr := s.authorizeCommit(ctx, bucketARN, namespace, tableName, identityName); reqErr != nil {
|
|
return nil, reqErr
|
|
}
|
|
|
|
location := tableLocation(getResp, bucketName, namespace, tableName)
|
|
locBucket, locPath, locErr := parseS3Location(location)
|
|
if locErr != nil {
|
|
return nil, &icebergRequestError{http.StatusInternalServerError, "InternalServerError", "Invalid table location: " + locErr.Error()}
|
|
}
|
|
if err := confineMetadataLocation(locBucket, locPath, bucketName); err != nil {
|
|
return nil, &icebergRequestError{http.StatusBadRequest, "BadRequestException", err.Error()}
|
|
}
|
|
tableUUID := uuid.Nil
|
|
if getResp.Metadata != nil && getResp.Metadata.Iceberg != nil && getResp.Metadata.Iceberg.TableUUID != "" {
|
|
if parsed, parseErr := uuid.Parse(getResp.Metadata.Iceberg.TableUUID); parseErr == nil {
|
|
tableUUID = parsed
|
|
}
|
|
}
|
|
|
|
currentBytes, err := s.currentMetadataBytes(ctx, getResp, bucketName)
|
|
if err != nil {
|
|
glog.Errorf("Iceberg: CommitTransaction load current metadata for %s: %v", tableName, err)
|
|
return nil, &icebergRequestError{http.StatusInternalServerError, "InternalServerError", "Failed to load current metadata"}
|
|
}
|
|
var currentMetadata table.Metadata
|
|
if len(currentBytes) > 0 {
|
|
currentMetadata, err = table.ParseMetadataBytes(currentBytes)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{http.StatusInternalServerError, "InternalServerError", "Failed to parse current metadata"}
|
|
}
|
|
if tableUUID == uuid.Nil {
|
|
tableUUID = currentMetadata.TableUUID()
|
|
}
|
|
}
|
|
if tableUUID == uuid.Nil {
|
|
tableUUID = uuid.New()
|
|
}
|
|
if currentMetadata == nil {
|
|
currentMetadata, err = newTableMetadata(tableUUID, location, nil, nil, nil, nil)
|
|
if err != nil {
|
|
glog.Errorf("Iceberg: CommitTransaction placeholder metadata for %s: %v", tableName, err)
|
|
return nil, &icebergRequestError{http.StatusInternalServerError, "InternalServerError", "Failed to build current metadata"}
|
|
}
|
|
}
|
|
|
|
for _, requirement := range requirements {
|
|
if err := requirement.Validate(currentMetadata); err != nil {
|
|
return nil, &icebergRequestError{http.StatusConflict, "CommitFailedException", "Requirement failed: " + err.Error()}
|
|
}
|
|
}
|
|
|
|
builder, err := table.MetadataBuilderFromBase(currentMetadata, getResp.MetadataLocation)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{http.StatusInternalServerError, "InternalServerError", "Failed to create metadata builder: " + err.Error()}
|
|
}
|
|
for _, update := range updates {
|
|
if err := update.Apply(builder); err != nil {
|
|
return nil, &icebergRequestError{http.StatusBadRequest, "BadRequestException", "Failed to apply update: " + err.Error()}
|
|
}
|
|
}
|
|
newMetadata, err := builder.Build()
|
|
if err != nil {
|
|
return nil, &icebergRequestError{http.StatusBadRequest, "BadRequestException", "Failed to build new metadata: " + err.Error()}
|
|
}
|
|
|
|
metadataVersion := getResp.MetadataVersion + 1
|
|
metadataFileName := fmt.Sprintf("v%d.metadata.json", metadataVersion)
|
|
newMetadataLocation := fmt.Sprintf("%s/metadata/%s", strings.TrimSuffix(location, "/"), metadataFileName)
|
|
|
|
metadataBytes, err := json.Marshal(newMetadata)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{http.StatusInternalServerError, "InternalServerError", "Failed to serialize metadata: " + err.Error()}
|
|
}
|
|
metadataBytes, err = applyStatisticsUpdates(metadataBytes, statisticsUpdates)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{http.StatusBadRequest, "BadRequestException", "Failed to apply statistics updates: " + err.Error()}
|
|
}
|
|
metadataBytes = refreshDefaultNameMapping(metadataBytes, newMetadata)
|
|
metadataBytes = ensureMetadataSpecCompliance(metadataBytes)
|
|
|
|
metadataBucket, metadataPath, err := parseS3Location(location)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{http.StatusInternalServerError, "InternalServerError", "Invalid table location: " + err.Error()}
|
|
}
|
|
if err := confineMetadataLocation(metadataBucket, metadataPath, bucketName); err != nil {
|
|
return nil, &icebergRequestError{http.StatusBadRequest, "BadRequestException", err.Error()}
|
|
}
|
|
|
|
prevMetadata := cloneTableMetadata(getResp.Metadata)
|
|
if len(currentBytes) > 0 && (getResp.Metadata == nil || len(getResp.Metadata.FullMetadata) == 0) {
|
|
// UpdateTable keeps the FullMetadata a flip stored when a restore sends
|
|
// none, so a record that held only a location gets back what loads
|
|
// served from its file rather than the transaction it is rolling back.
|
|
prevMetadata = cloneTableMetadata(&s3tables.TableMetadata{
|
|
Iceberg: &s3tables.IcebergMetadata{TableUUID: tableUUID.String()},
|
|
FullMetadata: currentBytes,
|
|
})
|
|
}
|
|
|
|
return &preparedTableCommit{
|
|
namespace: namespace,
|
|
tableName: tableName,
|
|
tableUUID: tableUUID,
|
|
versionToken: getResp.VersionToken,
|
|
metadataBucket: metadataBucket,
|
|
metadataPath: metadataPath,
|
|
location: location,
|
|
metadataFileName: metadataFileName,
|
|
metadataBytes: metadataBytes,
|
|
metadataVersion: metadataVersion,
|
|
newMetadataLoc: newMetadataLocation,
|
|
prevMetadataLoc: getResp.MetadataLocation,
|
|
prevMetadataVersion: getResp.MetadataVersion,
|
|
prevMetadata: prevMetadata,
|
|
}, nil
|
|
}
|
|
|
|
// cloneTableMetadata deep-copies the prior table metadata so a later rollback
|
|
// restores the exact pre-transaction bytes without aliasing the get response.
|
|
func cloneTableMetadata(m *s3tables.TableMetadata) *s3tables.TableMetadata {
|
|
if m == nil {
|
|
return nil
|
|
}
|
|
clone := &s3tables.TableMetadata{}
|
|
if m.Iceberg != nil {
|
|
iceberg := *m.Iceberg
|
|
clone.Iceberg = &iceberg
|
|
}
|
|
if len(m.FullMetadata) > 0 {
|
|
clone.FullMetadata = append(json.RawMessage(nil), m.FullMetadata...)
|
|
}
|
|
return clone
|
|
}
|
|
|
|
func parseTableChange(change tableChangeRequest) (table.Requirements, table.Updates, []statisticsUpdate, *icebergRequestError) {
|
|
var requirements table.Requirements
|
|
if len(change.Requirements) > 0 {
|
|
normalized, err := normalizeRequirements(change.Requirements)
|
|
if err != nil {
|
|
return nil, nil, nil, &icebergRequestError{http.StatusBadRequest, "BadRequestException", "Invalid requirements: " + err.Error()}
|
|
}
|
|
if err := json.Unmarshal(normalized, &requirements); err != nil {
|
|
return nil, nil, nil, &icebergRequestError{http.StatusBadRequest, "BadRequestException", "Invalid requirements: " + err.Error()}
|
|
}
|
|
}
|
|
var updates table.Updates
|
|
var statisticsUpdates []statisticsUpdate
|
|
if len(change.Updates) > 0 {
|
|
var err error
|
|
updates, statisticsUpdates, err = parseCommitUpdates(change.Updates)
|
|
if err != nil {
|
|
return nil, nil, nil, &icebergRequestError{http.StatusBadRequest, "BadRequestException", "Invalid updates: " + err.Error()}
|
|
}
|
|
}
|
|
return requirements, updates, statisticsUpdates, nil
|
|
}
|
|
|
|
func (s *Server) flipTablePointer(ctx context.Context, bucketARN, identityName string, pc *preparedTableCommit) error {
|
|
updateReq := &s3tables.UpdateTableRequest{
|
|
TableBucketARN: bucketARN,
|
|
Namespace: pc.namespace,
|
|
Name: pc.tableName,
|
|
VersionToken: pc.versionToken,
|
|
Metadata: &s3tables.TableMetadata{
|
|
Iceberg: &s3tables.IcebergMetadata{TableUUID: pc.tableUUID.String()},
|
|
FullMetadata: pc.metadataBytes,
|
|
},
|
|
MetadataVersion: pc.metadataVersion,
|
|
MetadataLocation: pc.newMetadataLoc,
|
|
}
|
|
fitUpdateTableRequest(updateReq)
|
|
return s.filerClient.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
|
|
mgrClient := s3tables.NewManagerClient(client)
|
|
return s.tablesManager.Execute(ctx, mgrClient, "UpdateTable", updateReq, nil, identityName)
|
|
})
|
|
}
|
|
|
|
// rollbackTablePointers restores already-flipped tables to their full prior
|
|
// state. handleUpdateTable applies partial field updates, so the restore must
|
|
// re-send every field the flip changed (location, version, and full metadata),
|
|
// not just the location. Best-effort: a failed rollback is logged, not surfaced.
|
|
// The returned slice flags, per flipped table, whether the restore succeeded so
|
|
// the caller can avoid deleting metadata a still-flipped pointer references.
|
|
func (s *Server) rollbackTablePointers(ctx context.Context, bucketARN, identityName string, flipped []preparedTableCommit) []bool {
|
|
restored := make([]bool, len(flipped))
|
|
for i := range flipped {
|
|
pc := &flipped[i]
|
|
updateReq := buildTableRestoreRequest(bucketARN, pc)
|
|
fitUpdateTableRequest(updateReq)
|
|
err := s.filerClient.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
|
|
mgrClient := s3tables.NewManagerClient(client)
|
|
return s.tablesManager.Execute(ctx, mgrClient, "UpdateTable", updateReq, nil, identityName)
|
|
})
|
|
if err != nil {
|
|
glog.Errorf("Iceberg: CommitTransaction rollback of %s failed: %v", pc.tableName, err)
|
|
continue
|
|
}
|
|
restored[i] = true
|
|
}
|
|
return restored
|
|
}
|
|
|
|
// buildTableRestoreRequest reconstructs the UpdateTableRequest that reverts a
|
|
// flipped table to its captured prior state. Every field handleUpdateTable
|
|
// would have mutated on the flip is re-supplied here so the partial update
|
|
// fully restores it (ModifiedAt and VersionToken are always regenerated by the
|
|
// handler and cannot be pinned back).
|
|
func buildTableRestoreRequest(bucketARN string, pc *preparedTableCommit) *s3tables.UpdateTableRequest {
|
|
return &s3tables.UpdateTableRequest{
|
|
TableBucketARN: bucketARN,
|
|
Namespace: pc.namespace,
|
|
Name: pc.tableName,
|
|
Metadata: cloneTableMetadata(pc.prevMetadata),
|
|
MetadataVersion: pc.prevMetadataVersion,
|
|
MetadataLocation: pc.prevMetadataLoc,
|
|
}
|
|
}
|
|
|
|
// cleanupSafeMetadata reports, per prepared table, whether deleting its newly
|
|
// written metadata file is safe after a flip failed at failedIndex. A file is
|
|
// safe to delete only when its table's pointer no longer references it: tables
|
|
// at or past failedIndex were never flipped, and earlier tables are safe only
|
|
// if their rollback succeeded. A table whose rollback failed still points at the
|
|
// new metadata, so deleting it would strand the pointer on a missing file.
|
|
func cleanupSafeMetadata(prepared []preparedTableCommit, failedIndex int, rolledBack []bool) []bool {
|
|
safe := make([]bool, len(prepared))
|
|
for i := range prepared {
|
|
switch {
|
|
case i >= failedIndex:
|
|
safe[i] = true
|
|
case i < len(rolledBack):
|
|
safe[i] = rolledBack[i]
|
|
}
|
|
}
|
|
return safe
|
|
}
|
|
|
|
// cleanupPreparedMetadata deletes the newly written metadata file for each
|
|
// prepared table flagged safe; unflagged tables are left in place because a
|
|
// still-flipped pointer references them.
|
|
func (s *Server) cleanupPreparedMetadata(ctx context.Context, prepared []preparedTableCommit, safe []bool) {
|
|
for i := range prepared {
|
|
pc := &prepared[i]
|
|
if i < len(safe) && !safe[i] {
|
|
glog.Errorf("Iceberg: CommitTransaction keeping metadata %s; %s rollback failed and still references it", pc.newMetadataLoc, pc.tableName)
|
|
continue
|
|
}
|
|
if cleanupErr := s.deleteMetadataFile(ctx, pc.metadataBucket, pc.metadataPath, pc.metadataFileName); cleanupErr != nil {
|
|
glog.V(1).Infof("Iceberg: failed to cleanup metadata file %s: %v", pc.newMetadataLoc, cleanupErr)
|
|
}
|
|
}
|
|
}
|