* chore: remove unreachable dead code across the codebase Remove ~50,000 lines of unreachable code identified by static analysis. Major removals: - weed/filer/redis_lua: entire unused Redis Lua filer store implementation - weed/wdclient/net2, resource_pool: unused connection/resource pool packages - weed/plugin/worker/lifecycle: unused lifecycle plugin worker - weed/s3api: unused S3 policy templates, presigned URL IAM, streaming copy, multipart IAM, key rotation, and various SSE helper functions - weed/mq/kafka: unused partition mapping, compression, schema, and protocol functions - weed/mq/offset: unused SQL storage and migration code - weed/worker: unused registry, task, and monitoring functions - weed/query: unused SQL engine, parquet scanner, and type functions - weed/shell: unused EC proportional rebalance functions - weed/storage/erasure_coding/distribution: unused distribution analysis functions - Individual unreachable functions removed from 150+ files across admin, credential, filer, iam, kms, mount, mq, operation, pb, s3api, server, shell, storage, topology, and util packages * fix(s3): reset shared memory store in IAM test to prevent flaky failure TestLoadIAMManagerFromConfig_EmptyConfigWithFallbackKey was flaky because the MemoryStore credential backend is a singleton registered via init(). Earlier tests that create anonymous identities pollute the shared store, causing LookupAnonymous() to unexpectedly return true. Fix by calling Reset() on the memory store before the test runs. * style: run gofmt on changed files * fix: restore KMS functions used by integration tests * fix(plugin): prevent panic on send to closed worker session channel The Plugin.sendToWorker method could panic with "send on closed channel" when a worker disconnected while a message was being sent. The race was between streamSession.close() closing the outgoing channel and sendToWorker writing to it concurrently. Add a done channel to streamSession that is closed before the outgoing channel, and check it in sendToWorker's select to safely detect closed sessions without panicking.
211 lines
6.5 KiB
Go
211 lines
6.5 KiB
Go
package iceberg
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"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/s3tables"
|
|
)
|
|
|
|
const requirementAssertCreate = "assert-create"
|
|
|
|
type icebergRequestError struct {
|
|
status int
|
|
errType string
|
|
message string
|
|
}
|
|
|
|
type createOnCommitInput struct {
|
|
bucketARN string
|
|
markerBucket string
|
|
namespace []string
|
|
tableName string
|
|
identityName string
|
|
location string
|
|
tableUUID uuid.UUID
|
|
baseMetadata table.Metadata
|
|
baseMetadataLoc string
|
|
baseMetadataVer int
|
|
updates table.Updates
|
|
statisticsUpdates []statisticsUpdate
|
|
}
|
|
|
|
func isS3TablesConflict(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
if errors.Is(err, s3tables.ErrVersionTokenMismatch) {
|
|
return true
|
|
}
|
|
var tableErr *s3tables.S3TablesError
|
|
return errors.As(err, &tableErr) && tableErr.Type == s3tables.ErrCodeConflict
|
|
}
|
|
|
|
func isS3TablesNotFound(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
if strings.Contains(strings.ToLower(err.Error()), "not found") {
|
|
return true
|
|
}
|
|
var tableErr *s3tables.S3TablesError
|
|
return errors.As(err, &tableErr) &&
|
|
(tableErr.Type == s3tables.ErrCodeNoSuchTable || tableErr.Type == s3tables.ErrCodeNoSuchNamespace || strings.Contains(strings.ToLower(tableErr.Message), "not found"))
|
|
}
|
|
|
|
func hasAssertCreateRequirement(requirements table.Requirements) bool {
|
|
for _, requirement := range requirements {
|
|
if requirement.GetType() == requirementAssertCreate {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func isS3TablesAlreadyExists(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
if strings.Contains(strings.ToLower(err.Error()), "already exists") {
|
|
return true
|
|
}
|
|
var tableErr *s3tables.S3TablesError
|
|
return errors.As(err, &tableErr) &&
|
|
(tableErr.Type == s3tables.ErrCodeTableAlreadyExists || tableErr.Type == s3tables.ErrCodeNamespaceAlreadyExists || strings.Contains(strings.ToLower(tableErr.Message), "already exists"))
|
|
}
|
|
|
|
func (s *Server) finalizeCreateOnCommit(ctx context.Context, input createOnCommitInput) (*CommitTableResponse, *icebergRequestError) {
|
|
builder, err := table.MetadataBuilderFromBase(input.baseMetadata, input.baseMetadataLoc)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusInternalServerError,
|
|
errType: "InternalServerError",
|
|
message: "Failed to create metadata builder: " + err.Error(),
|
|
}
|
|
}
|
|
for _, update := range input.updates {
|
|
if err := update.Apply(builder); err != nil {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusBadRequest,
|
|
errType: "BadRequestException",
|
|
message: "Failed to apply update: " + err.Error(),
|
|
}
|
|
}
|
|
}
|
|
|
|
newMetadata, err := builder.Build()
|
|
if err != nil {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusBadRequest,
|
|
errType: "BadRequestException",
|
|
message: "Failed to build new metadata: " + err.Error(),
|
|
}
|
|
}
|
|
|
|
metadataVersion := input.baseMetadataVer + 1
|
|
if metadataVersion <= 0 {
|
|
metadataVersion = 1
|
|
}
|
|
metadataFileName := fmt.Sprintf("v%d.metadata.json", metadataVersion)
|
|
newMetadataLocation := fmt.Sprintf("%s/metadata/%s", strings.TrimSuffix(input.location, "/"), metadataFileName)
|
|
|
|
metadataBytes, err := json.Marshal(newMetadata)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusInternalServerError,
|
|
errType: "InternalServerError",
|
|
message: "Failed to serialize metadata: " + err.Error(),
|
|
}
|
|
}
|
|
metadataBytes, err = applyStatisticsUpdates(metadataBytes, input.statisticsUpdates)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusBadRequest,
|
|
errType: "BadRequestException",
|
|
message: "Failed to apply statistics updates: " + err.Error(),
|
|
}
|
|
}
|
|
newMetadata, err = table.ParseMetadataBytes(metadataBytes)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusInternalServerError,
|
|
errType: "InternalServerError",
|
|
message: "Failed to parse committed metadata: " + err.Error(),
|
|
}
|
|
}
|
|
|
|
metadataBucket, metadataPath, err := parseS3Location(input.location)
|
|
if err != nil {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusInternalServerError,
|
|
errType: "InternalServerError",
|
|
message: "Invalid table location: " + err.Error(),
|
|
}
|
|
}
|
|
if err := s.saveMetadataFile(ctx, metadataBucket, metadataPath, metadataFileName, metadataBytes); err != nil {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusInternalServerError,
|
|
errType: "InternalServerError",
|
|
message: "Failed to save metadata file: " + err.Error(),
|
|
}
|
|
}
|
|
|
|
createReq := &s3tables.CreateTableRequest{
|
|
TableBucketARN: input.bucketARN,
|
|
Namespace: input.namespace,
|
|
Name: input.tableName,
|
|
Format: "ICEBERG",
|
|
Metadata: &s3tables.TableMetadata{
|
|
Iceberg: &s3tables.IcebergMetadata{
|
|
TableUUID: input.tableUUID.String(),
|
|
},
|
|
FullMetadata: metadataBytes,
|
|
},
|
|
MetadataVersion: metadataVersion,
|
|
MetadataLocation: newMetadataLocation,
|
|
}
|
|
createErr := s.filerClient.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
|
|
mgrClient := s3tables.NewManagerClient(client)
|
|
return s.tablesManager.Execute(ctx, mgrClient, "CreateTable", createReq, nil, input.identityName)
|
|
})
|
|
if createErr != nil {
|
|
if cleanupErr := s.deleteMetadataFile(ctx, metadataBucket, metadataPath, metadataFileName); cleanupErr != nil {
|
|
glog.V(1).Infof("Iceberg: failed to cleanup metadata file %s after create-on-commit failure: %v", newMetadataLocation, cleanupErr)
|
|
}
|
|
if isS3TablesConflict(createErr) || isS3TablesAlreadyExists(createErr) {
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusConflict,
|
|
errType: "CommitFailedException",
|
|
message: "Table was created concurrently",
|
|
}
|
|
}
|
|
glog.Errorf("Iceberg: CommitTable CreateTable error: %v", createErr)
|
|
return nil, &icebergRequestError{
|
|
status: http.StatusInternalServerError,
|
|
errType: "InternalServerError",
|
|
message: "Failed to commit table creation: " + createErr.Error(),
|
|
}
|
|
}
|
|
|
|
markerBucket := input.markerBucket
|
|
if markerBucket == "" {
|
|
markerBucket = metadataBucket
|
|
}
|
|
if markerErr := s.deleteStageCreateMarkers(ctx, markerBucket, input.namespace, input.tableName); markerErr != nil {
|
|
glog.V(1).Infof("Iceberg: failed to cleanup stage-create markers for %s.%s after finalize: %v", encodeNamespace(input.namespace), input.tableName, markerErr)
|
|
}
|
|
|
|
return &CommitTableResponse{
|
|
MetadataLocation: newMetadataLocation,
|
|
Metadata: newMetadata,
|
|
}, nil
|
|
}
|