mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-13 10:00:41 +02:00
* s3tables: add the maintenance configuration APIs Stores the configuration verbatim as the wire shape under a new s3tables.maintenance extended attribute, so Get hands back what Put took and no translation layer can drift from the AWS model. Nothing reads the configuration yet. Put merges a single type into the stored map so configuring compaction does not drop snapshot management, and asserts the attribute's prior value so two concurrent Puts cannot silently clobber each other. * iceberg: apply the maintenance configuration in the worker The worker now reads the per-table and per-bucket maintenance configuration written by the control plane, so the wildcard plugin config is a default rather than the only setting a table can have. Table properties still win by default, since a table declaring its own layout is what every engine honours and the compactor has to agree with whoever writes the files. Clearing table_properties_override makes the maintenance configuration authoritative instead. Status is not part of that contest: a disabled type drops its operations and no property can re-enable them, so the operator's kill switch always holds. Manifest and delete-file rewrites have no AWS equivalent and ride with compaction. Detection reads both attributes from entries it already lists. * s3tables: report maintenance job status The worker records the outcome of each run in its own extended attribute, separate from the configuration so operator and worker writes do not contend, and GetTableMaintenanceJobStatus reads it back. Only the types a run touched are written, so a partial run cannot erase what an earlier one recorded. The reader fills in the rest: Disabled when the configuration switched a type off, Not_Yet_Run otherwise. Status is advisory, so a lost race is logged rather than failing a job whose work already committed. * s3tables: route the maintenance APIs over REST The five actions were only reachable by X-Amz-Target dispatch, which the AWS CLI and SDK do not use for this service. They address the operations by path, so the APIs were unreachable from any official client. * s3tables: fix the table bucket ARN field name GetTableBucketMaintenanceConfiguration emitted tableBucketArn where the wire field is tableBucketARN, as every other response in this package already spells it. Official SDK deserializers ignore the unknown key, so the required field came back unset. * s3tables: carry the compaction strategy through to the worker IcebergCompactionSettings modelled only targetFileSizeMB, so a request naming a strategy was accepted and then dropped on the way to storage. The worker now maps binpack and sort onto its own rewrite strategy and lets auto defer to the worker configuration. z-order is rejected rather than accepted and quietly binpacked. * s3tables: report bucket-level maintenance status GetTableMaintenanceJobStatus read only the table's configuration, so unreferenced file removal — which is configured on the bucket — reported Not_Yet_Run or a stale success after an operator disabled it. The merge helper now lives in this package and the worker shares it. * iceberg: delete orphans only after the non-current window AWS marks a file non-current once it has been unreferenced for unreferencedDays, then deletes it a further nonCurrentDays later. The cutoff was taken from unreferencedDays alone, so a 3/10 configuration hard-deleted on day three and threw away the ten day recovery window. remove_orphans deletes in one step rather than marking, so the cutoff is now the sum of the two. * s3tables: assert every attribute when rewriting an entry UpdateEntry writes the whole entry back from the snapshot the caller read, and its precondition only covers the keys the caller names. Both maintenance writers named one key, so a job status write could revert a maintenance configuration an operator had just disabled, turning an advisory write into a silent re-enable. Both now assert the entry's full attribute set, including the target key when absent so a concurrent create also fails the precondition. * s3tables: assert absent attributes when rewriting an entry The precondition covered the attributes present when the writer read the entry, so an attribute created between that read and the write was absent from it. A first-time PutTableMaintenanceConfiguration disabling a type therefore lands, passes the per-key checks, and is then deleted by the stale whole-entry write. Every attribute this package stores is now asserted, absent ones included. The metadata commit and planning index writers rewrite the same entries and had the same exposure, so both use the shared snapshot too. * iceberg: implement the auto compaction strategy auto was accepted, stored and read back, but left the worker on its own default, so a sorted table configured as auto was compacted with binpack. AWS defines auto as sorting tables that declare a sort order and bin-packing the rest. That needs the table metadata, so the choice is made where the rewrite plan is resolved: an unsorted table falls back to binpack rather than failing the way an explicit sort request does. * s3tables: validate the maintenance setting ranges PUT accepted zero, negative and oversized values for every numeric setting. The worker then ignores a non-positive value and saturates an oversized one, so the configuration read back was not the one that ran. AWS bounds all five to 1..2147483647, which is now enforced. The fields are pointers so an explicit zero is distinguishable from an omitted one and can be rejected rather than silently ignored. * s3tables: give every entry writer the same compare-and-swap updateExtendedAttribute asserted the entry's attributes, but the helpers behind the metadata, policy and tag handlers still wrote the whole entry unconditionally. Any of them could land on a stale snapshot and delete a maintenance configuration an operator had just written. They all share one read-modify-write loop now, so the precondition and the bounded retry apply wherever an entry is rewritten. * s3tables: move the maintenance configuration with a renamed table RenameTable carried the metadata, version, policy and tags to the new name but left the maintenance configuration and job status behind. A table with snapshot management disabled came back enabled under its new name, and the stale configuration stayed on the old name where a table created there would inherit it. The decoupled-delete cleanup left the same two attributes behind. * s3tables: accept every AWS partition in ARNs The route regexes and the ARN patterns both hardcoded arn:aws, so valid aws-cn and aws-us-gov ARNs never reached a handler. The router now shares the partition-tolerant prefix with the parser, and a generated ARN uses the partition its region belongs to so it parses back. * s3tables: generate ARNs in the region's partition The handler's own ARN generators still formatted arn:aws directly rather than going through the partition-aware builder, so a China or GovCloud deployment routed the request but then returned a commercial ARN and matched IAM policies against it. The round-trip test missed this because parsing accepts any partition, so it now asserts the prefix the region implies. * s3tables: complete the ARN partition table aws-iso-e, aws-iso-f and aws-eusc were missing, so eu-isoe-*, us-isof-* and eusc-* regions fell through to the commercial partition. * s3tables: do not let a rename swallow a concurrent maintenance write Rename copied the source attributes early and cleared the source at the end, so a Put landing in between missed the copy to the destination and was then deleted by the cleanup. It succeeded and vanished. The cleanup now clears the source only while it still holds exactly what was copied, and returns a conflict otherwise. Put checks the catalog identity inside the same conditional mutation, so it also cannot write to a name that a rename or delete has already soft-deleted.
234 lines
8.3 KiB
Go
234 lines
8.3 KiB
Go
package iceberg
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"path"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/apache/iceberg-go"
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3tables"
|
|
)
|
|
|
|
// Iceberg table properties that describe the physical layout maintenance has
|
|
// to produce.
|
|
const (
|
|
propTargetFileSize = "write.target-file-size-bytes"
|
|
propDeleteTargetFileSize = "write.delete.target-file-size-bytes"
|
|
propMaxSnapshotAgeMs = "history.expire.max-snapshot-age-ms"
|
|
propMinSnapshotsToKeep = "history.expire.min-snapshots-to-keep"
|
|
)
|
|
|
|
// resolveTableConfig layers a table's own intent over the worker config, from
|
|
// the maintenance configuration and from the table's Iceberg properties.
|
|
//
|
|
// Properties win by default: a writer targeting 512 MiB and a compactor
|
|
// rewriting to 256 MiB would rewrite each other's output forever, and the
|
|
// property is the signal every engine already honours. Operators who want the
|
|
// control plane to be authoritative instead can clear
|
|
// table_properties_override.
|
|
func resolveTableConfig(base Config, props iceberg.Properties, maintenance s3tables.MaintenanceConfiguration) Config {
|
|
cfg := base
|
|
if base.TablePropertiesOverride {
|
|
cfg = applyMaintenanceConfig(cfg, maintenance)
|
|
cfg = applyTableProperties(cfg, props)
|
|
} else {
|
|
cfg = applyTableProperties(cfg, props)
|
|
cfg = applyMaintenanceConfig(cfg, maintenance)
|
|
}
|
|
return applyThresholdDefaults(cfg)
|
|
}
|
|
|
|
func applyTableProperties(cfg Config, props iceberg.Properties) Config {
|
|
if v, ok := propInt64(props, propTargetFileSize); ok {
|
|
cfg.TargetFileSizeBytes = v
|
|
}
|
|
if v, ok := propInt64(props, propDeleteTargetFileSize); ok {
|
|
cfg.DeleteTargetFileSizeBytes = v
|
|
}
|
|
if v, ok := propInt64(props, propMaxSnapshotAgeMs); ok {
|
|
cfg.SnapshotRetentionMs = v
|
|
}
|
|
if v, ok := propInt64(props, propMinSnapshotsToKeep); ok {
|
|
cfg.MaxSnapshotsToKeep = v
|
|
}
|
|
return cfg
|
|
}
|
|
|
|
func applyMaintenanceConfig(cfg Config, maintenance s3tables.MaintenanceConfiguration) Config {
|
|
if s := compactionSettings(maintenance); s != nil {
|
|
if v := settingValue(s.TargetFileSizeMB); v > 0 {
|
|
cfg.TargetFileSizeBytes = mbToBytes(v)
|
|
}
|
|
switch s.Strategy {
|
|
case s3tables.CompactionStrategyBinpack, s3tables.CompactionStrategySort, s3tables.CompactionStrategyAuto:
|
|
cfg.RewriteStrategy = s.Strategy
|
|
}
|
|
}
|
|
if s := snapshotSettings(maintenance); s != nil {
|
|
if v := settingValue(s.MaxSnapshotAgeHours); v > 0 {
|
|
cfg.SnapshotRetentionMs = hoursToMs(v)
|
|
}
|
|
if v := settingValue(s.MinSnapshotsToKeep); v > 0 {
|
|
cfg.MaxSnapshotsToKeep = v
|
|
}
|
|
}
|
|
// AWS marks a file non-current after unreferencedDays and deletes it a
|
|
// further nonCurrentDays later. remove_orphans deletes in one step, so the
|
|
// cutoff has to be the sum or the recovery window disappears.
|
|
if s := orphanSettings(maintenance); s != nil {
|
|
if days := addDays(settingValue(s.UnreferencedDays), settingValue(s.NonCurrentDays)); days > 0 {
|
|
cfg.OrphanOlderThanHours = daysToHours(days)
|
|
}
|
|
}
|
|
return cfg
|
|
}
|
|
|
|
// settingValue reads an optional maintenance setting, treating unset and
|
|
// nonsensical values alike so the worker keeps its own configuration.
|
|
func settingValue(v *int64) int64 {
|
|
if v == nil || *v < 0 {
|
|
return 0
|
|
}
|
|
return *v
|
|
}
|
|
|
|
func compactionSettings(maintenance s3tables.MaintenanceConfiguration) *s3tables.IcebergCompactionSettings {
|
|
if v := enabledSettings(maintenance, s3tables.MaintenanceTypeIcebergCompaction); v != nil {
|
|
return v.IcebergCompaction
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func snapshotSettings(maintenance s3tables.MaintenanceConfiguration) *s3tables.IcebergSnapshotManagementSettings {
|
|
if v := enabledSettings(maintenance, s3tables.MaintenanceTypeIcebergSnapshotManagement); v != nil {
|
|
return v.IcebergSnapshotManagement
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func orphanSettings(maintenance s3tables.MaintenanceConfiguration) *s3tables.IcebergUnreferencedFileRemovalSettings {
|
|
if v := enabledSettings(maintenance, s3tables.MaintenanceTypeIcebergUnreferencedFileRemoval); v != nil {
|
|
return v.IcebergUnreferencedFileRemoval
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// enabledSettings returns the settings for a maintenance type only when it is
|
|
// switched on; a disabled type drops its operations instead of retuning them.
|
|
func enabledSettings(maintenance s3tables.MaintenanceConfiguration, maintenanceType string) *s3tables.MaintenanceSettings {
|
|
value, ok := maintenance[maintenanceType]
|
|
if !ok || value == nil || value.Status == s3tables.MaintenanceStatusDisabled {
|
|
return nil
|
|
}
|
|
return value.Settings
|
|
}
|
|
|
|
var mergeMaintenanceConfiguration = s3tables.MergeMaintenanceConfiguration
|
|
|
|
// maintenanceJobType maps a worker operation onto the AWS job type that governs
|
|
// it. Manifest and delete-file rewrites have no AWS equivalent and ride along
|
|
// with compaction, so disabling compaction stops all rewriting.
|
|
func maintenanceJobType(op string) string {
|
|
switch op {
|
|
case "compact", "rewrite_position_delete_files", "rewrite_manifests":
|
|
return s3tables.MaintenanceTypeIcebergCompaction
|
|
case "expire_snapshots":
|
|
return s3tables.MaintenanceTypeIcebergSnapshotManagement
|
|
case "remove_orphans":
|
|
return s3tables.MaintenanceTypeIcebergUnreferencedFileRemoval
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// filterDisabledOperations drops the operations the maintenance configuration
|
|
// switched off. No table property can re-enable them.
|
|
func filterDisabledOperations(ops []string, maintenance s3tables.MaintenanceConfiguration) []string {
|
|
if len(maintenance) == 0 {
|
|
return ops
|
|
}
|
|
|
|
filtered := make([]string, 0, len(ops))
|
|
for _, op := range ops {
|
|
value, ok := maintenance[maintenanceJobType(op)]
|
|
if ok && value != nil && value.Status == s3tables.MaintenanceStatusDisabled {
|
|
continue
|
|
}
|
|
filtered = append(filtered, op)
|
|
}
|
|
return filtered
|
|
}
|
|
|
|
// loadMaintenanceConfiguration reads the bucket and table maintenance
|
|
// configuration and overlays the table's on the bucket's. Detection gets both
|
|
// from entries it already listed; execution has to look them up.
|
|
func loadMaintenanceConfiguration(ctx context.Context, client filer_pb.SeaweedFilerClient, bucketName, tablePath string) (s3tables.MaintenanceConfiguration, error) {
|
|
bucketDir := path.Join(s3tables.TablesPath, bucketName)
|
|
tableDir := path.Join(bucketDir, tablePath)
|
|
|
|
bucket, err := lookupMaintenanceConfiguration(ctx, client, bucketDir, bucketName)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
table, err := lookupMaintenanceConfiguration(ctx, client, tableDir, path.Join(bucketName, tablePath))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return mergeMaintenanceConfiguration(bucket, table), nil
|
|
}
|
|
|
|
func lookupMaintenanceConfiguration(ctx context.Context, client filer_pb.SeaweedFilerClient, dir, resource string) (s3tables.MaintenanceConfiguration, error) {
|
|
resp, err := filer_pb.LookupEntry(ctx, client, &filer_pb.LookupDirectoryEntryRequest{
|
|
Directory: path.Dir(dir),
|
|
Name: path.Base(dir),
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("look up %s: %w", resource, err)
|
|
}
|
|
if resp == nil || resp.Entry == nil {
|
|
return nil, nil
|
|
}
|
|
return parseMaintenanceConfiguration(resp.Entry.Extended, resource)
|
|
}
|
|
|
|
// parseMaintenanceConfiguration reads the maintenance configuration stored on a
|
|
// filer entry. An unreadable attribute is an error rather than an empty
|
|
// configuration: treating it as empty would run operations the operator
|
|
// disabled.
|
|
func parseMaintenanceConfiguration(extended map[string][]byte, resource string) (s3tables.MaintenanceConfiguration, error) {
|
|
data, ok := extended[s3tables.ExtendedKeyMaintenance]
|
|
if !ok || len(data) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
var config s3tables.MaintenanceConfiguration
|
|
if err := json.Unmarshal(data, &config); err != nil {
|
|
return nil, fmt.Errorf("parse maintenance configuration on %s: %w", resource, err)
|
|
}
|
|
return config, nil
|
|
}
|
|
|
|
// propInt64 reads a positive integer table property. Anything unset,
|
|
// unparseable or non-positive leaves the worker config in place so a
|
|
// misconfigured table never stops its own maintenance.
|
|
func propInt64(props iceberg.Properties, key string) (int64, bool) {
|
|
raw, ok := props[key]
|
|
if !ok {
|
|
return 0, false
|
|
}
|
|
value, err := strconv.ParseInt(strings.TrimSpace(raw), 10, 64)
|
|
if err != nil {
|
|
glog.V(1).Infof("iceberg maintenance: ignoring table property %s=%q: not an integer", key, raw)
|
|
return 0, false
|
|
}
|
|
if value <= 0 {
|
|
glog.V(1).Infof("iceberg maintenance: ignoring table property %s=%d: not positive", key, value)
|
|
return 0, false
|
|
}
|
|
return value, true
|
|
}
|