mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-16 11:08:39 +02:00
* refactor(worker): co-locate plugin handlers with their task packages
Move every per-task plugin handler from weed/plugin/worker/ into the
matching weed/worker/tasks/<name>/ package, so each task owns its
detection, scheduling, execution, and plugin handler in one place.
Step 0 (within pluginworker, no behavior change): extract shared helpers
that previously lived inside individual handler files into dedicated
files and export the ones now consumed across packages.
- activity.go: BuildExecutorActivity, BuildDetectorActivity
- config.go: ReadStringConfig/Double/Int64/Bytes/StringList, MapTaskPriority
- interval.go: ShouldSkipDetectionByInterval
- volume_state.go: VolumeState + consts, FilterMetricsByVolumeState/Location
- collection_filter.go: CollectionFilterMode + consts
- volume_metrics.go: export CollectVolumeMetricsFromMasters,
MasterAddressCandidates, FetchVolumeList
- testing_senders_test.go: shared test stubs
Phase 1: move the per-task plugin handlers (and the iceberg subpackage)
into their task packages.
weed/plugin/worker/vacuum_handler.go -> weed/worker/tasks/vacuum/plugin_handler.go
weed/plugin/worker/ec_balance_handler.go -> weed/worker/tasks/ec_balance/plugin_handler.go
weed/plugin/worker/erasure_coding_handler.go -> weed/worker/tasks/erasure_coding/plugin_handler.go
weed/plugin/worker/volume_balance_handler.go -> weed/worker/tasks/balance/plugin_handler.go
weed/plugin/worker/iceberg/ -> weed/worker/tasks/iceberg/
weed/plugin/worker/handlers/handlers.go now blank-imports all five
task subpackages so their init() registrations fire.
weed/command/mini.go and the worker tests construct the handler with
vacuum.DefaultMaxExecutionConcurrency (the constant moved with the
vacuum handler).
admin_script remains in weed/plugin/worker/ because there is no
underlying weed/worker/tasks/admin_script/ package to merge with.
* refactor(worker): update test/plugin_workers imports for moved handlers
Three handler constructors moved out of pluginworker into their task
packages — update the integration test files in test/plugin_workers/
to import from the new locations:
pluginworker.NewVacuumHandler -> vacuum.NewVacuumHandler
pluginworker.NewVolumeBalanceHandler -> balance.NewVolumeBalanceHandler
pluginworker.NewErasureCodingHandler -> erasure_coding.NewErasureCodingHandler
The pluginworker import is kept where the file still uses
pluginworker.WorkerOptions / pluginworker.JobHandler.
* refactor(worker): update test/s3tables iceberg import path
The iceberg subpackage moved from weed/plugin/worker/iceberg/ to
weed/worker/tasks/iceberg/. test/s3tables/maintenance/maintenance_integration_test.go
still imported the old path, breaking S3 Tables / RisingWave / Trino /
Spark / Iceberg-catalog / STS integration test builds.
Mirrors the OSS-side fix needed by every job in the run that
transitively imports test/s3tables/maintenance.
* chore: gofmt PR-touched files
The S3 Tables Format Check job runs `gofmt -l` over weed/s3api/s3tables
and test/s3tables, then fails if anything is unformatted. Files this
PR moved or modified had import-grouping and trailing-spacing issues
introduced by perl-based renames; reformat them with gofmt -w.
Touched files:
test/plugin_workers/erasure_coding/{detection,execution}_test.go
test/s3tables/maintenance/maintenance_integration_test.go
weed/plugin/worker/handlers/handlers.go
weed/worker/tasks/{balance,ec_balance,erasure_coding,vacuum}/plugin_handler*.go
* refactor(worker): bounds-checked int conversions for plugin config values
CodeQL flagged 18 go/incorrect-integer-conversion warnings on the moved
plugin handler files: results of pluginworker.ReadInt64Config (which
ultimately calls strconv.ParseInt with bit size 64) were being narrowed
to int32/uint32/int without an upper-bound check, so a malicious or
malformed admin/worker config value could overflow the target type.
Add three helpers in weed/plugin/worker/config.go that wrap
ReadInt64Config and clamp out-of-range values back to the caller's
fallback:
ReadInt32Config (math.MinInt32 .. math.MaxInt32)
ReadUint32Config (0 .. math.MaxUint32)
ReadIntConfig (math.MinInt32 .. math.MaxInt32, platform-portable)
Update each flagged call site in the four moved task packages to use
the bounds-checked helper. For protobuf uint32 fields (volume IDs)
the variable type also becomes uint32, removing the trailing
uint32(volumeID) casts and changing the "missing volume_id" check
from `<= 0` to `== 0`.
Touched files:
weed/plugin/worker/config.go
weed/worker/tasks/balance/plugin_handler.go
weed/worker/tasks/erasure_coding/plugin_handler.go
weed/worker/tasks/vacuum/plugin_handler.go
* refactor(worker): use ReadIntConfig for clamped derive-worker-config helpers
CodeQL still flagged three call sites where ReadInt64Config was being
narrowed to int after a value-range clamp (max_concurrent_moves <= 50,
batch_size <= 100, min_server_count >= 2). The clamp is correct but
CodeQL's flow analysis didn't recognize the bound, so it flagged them
as unbounded narrowing.
Switch to ReadIntConfig (already int32-bounded by the helper) for
those three sites, drop the now-redundant int64 intermediate variables.
Also drops the now-unused `> math.MaxInt32` clamp in
ec_balance.deriveECBalanceWorkerConfig (the helper covers it).
252 lines
7.4 KiB
Go
252 lines
7.4 KiB
Go
package iceberg
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"path"
|
|
"time"
|
|
|
|
"github.com/apache/iceberg-go"
|
|
"github.com/apache/iceberg-go/table"
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3tables"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
)
|
|
|
|
type planningIndex struct {
|
|
SnapshotID int64 `json:"snapshotId"`
|
|
ManifestList string `json:"manifestList,omitempty"`
|
|
UpdatedAtMs int64 `json:"updatedAtMs"`
|
|
DataManifestCount int64 `json:"dataManifestCount,omitempty"`
|
|
Compaction *planningIndexCompaction `json:"compaction,omitempty"`
|
|
RewriteManifests *planningIndexRewriteManifests `json:"rewriteManifests,omitempty"`
|
|
}
|
|
|
|
type planningIndexCompaction struct {
|
|
ConfigHash string `json:"configHash"`
|
|
Eligible bool `json:"eligible"`
|
|
}
|
|
|
|
type planningIndexRewriteManifests struct {
|
|
Threshold int64 `json:"threshold"`
|
|
Eligible bool `json:"eligible"`
|
|
}
|
|
|
|
type tableMetadataEnvelope struct {
|
|
MetadataVersion int `json:"metadataVersion"`
|
|
MetadataLocation string `json:"metadataLocation,omitempty"`
|
|
Metadata *struct {
|
|
FullMetadata json.RawMessage `json:"fullMetadata,omitempty"`
|
|
} `json:"metadata,omitempty"`
|
|
PlanningIndex json.RawMessage `json:"planningIndex,omitempty"`
|
|
}
|
|
|
|
func parseTableMetadataEnvelope(metadataBytes []byte) (table.Metadata, string, *planningIndex, error) {
|
|
var envelope tableMetadataEnvelope
|
|
if err := json.Unmarshal(metadataBytes, &envelope); err != nil {
|
|
return nil, "", nil, fmt.Errorf("parse metadata xattr: %w", err)
|
|
}
|
|
if envelope.Metadata == nil || len(envelope.Metadata.FullMetadata) == 0 {
|
|
return nil, "", nil, fmt.Errorf("no fullMetadata in table xattr")
|
|
}
|
|
|
|
meta, err := table.ParseMetadataBytes(envelope.Metadata.FullMetadata)
|
|
if err != nil {
|
|
return nil, "", nil, fmt.Errorf("parse iceberg metadata: %w", err)
|
|
}
|
|
|
|
var index *planningIndex
|
|
if len(envelope.PlanningIndex) > 0 {
|
|
if err := json.Unmarshal(envelope.PlanningIndex, &index); err != nil {
|
|
glog.V(2).Infof("iceberg maintenance: ignoring invalid planning index cache: %v", err)
|
|
index = nil
|
|
}
|
|
}
|
|
|
|
metadataFileName := metadataFileNameFromLocation(envelope.MetadataLocation, "", "")
|
|
if metadataFileName == "" {
|
|
metadataFileName = fmt.Sprintf("v%d.metadata.json", envelope.MetadataVersion)
|
|
}
|
|
return meta, metadataFileName, index, nil
|
|
}
|
|
|
|
func (idx *planningIndex) matchesSnapshot(meta table.Metadata) bool {
|
|
if idx == nil {
|
|
return false
|
|
}
|
|
currentSnap := meta.CurrentSnapshot()
|
|
if currentSnap == nil || currentSnap.ManifestList == "" {
|
|
return false
|
|
}
|
|
return idx.SnapshotID == currentSnap.SnapshotID && idx.ManifestList == currentSnap.ManifestList
|
|
}
|
|
|
|
func (idx *planningIndex) compactionEligible(config Config) (bool, bool) {
|
|
if idx == nil || idx.Compaction == nil {
|
|
return false, false
|
|
}
|
|
if idx.Compaction.ConfigHash != compactionPlanningConfigHash(config) {
|
|
return false, false
|
|
}
|
|
return idx.Compaction.Eligible, true
|
|
}
|
|
|
|
func (idx *planningIndex) rewriteManifestsEligible(config Config) (bool, bool) {
|
|
if idx == nil || idx.RewriteManifests == nil {
|
|
return false, false
|
|
}
|
|
if idx.RewriteManifests.Threshold != config.MinManifestsToRewrite {
|
|
return false, false
|
|
}
|
|
return idx.RewriteManifests.Eligible, true
|
|
}
|
|
|
|
func compactionPlanningConfigHash(config Config) string {
|
|
return fmt.Sprintf("target=%d|min=%d|strategy=%s|sortcap=%d",
|
|
config.TargetFileSizeBytes, config.MinInputFiles,
|
|
config.RewriteStrategy, config.SortMaxInputBytes)
|
|
}
|
|
|
|
func operationRequested(ops []string, wanted string) bool {
|
|
for _, op := range ops {
|
|
if op == wanted {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func mergePlanningIndexSections(index, existing *planningIndex) *planningIndex {
|
|
if index == nil || existing == nil {
|
|
return index
|
|
}
|
|
if index.SnapshotID != existing.SnapshotID || index.ManifestList != existing.ManifestList {
|
|
return index
|
|
}
|
|
if index.Compaction == nil && existing.Compaction != nil {
|
|
compactionCopy := *existing.Compaction
|
|
index.Compaction = &compactionCopy
|
|
}
|
|
if index.RewriteManifests == nil && existing.RewriteManifests != nil {
|
|
rewriteCopy := *existing.RewriteManifests
|
|
index.RewriteManifests = &rewriteCopy
|
|
}
|
|
return index
|
|
}
|
|
|
|
func buildPlanningIndexFromManifests(
|
|
ctx context.Context,
|
|
filerClient filer_pb.SeaweedFilerClient,
|
|
bucketName, tablePath string,
|
|
meta table.Metadata,
|
|
config Config,
|
|
ops []string,
|
|
manifests []iceberg.ManifestFile,
|
|
) (*planningIndex, error) {
|
|
currentSnap := meta.CurrentSnapshot()
|
|
if currentSnap == nil || currentSnap.ManifestList == "" {
|
|
return nil, nil
|
|
}
|
|
|
|
index := &planningIndex{
|
|
SnapshotID: currentSnap.SnapshotID,
|
|
ManifestList: currentSnap.ManifestList,
|
|
UpdatedAtMs: time.Now().UnixMilli(),
|
|
DataManifestCount: countDataManifests(manifests),
|
|
}
|
|
|
|
if operationRequested(ops, "compact") {
|
|
eligible, err := hasEligibleCompaction(ctx, filerClient, bucketName, tablePath, manifests, config, meta, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
index.Compaction = &planningIndexCompaction{
|
|
ConfigHash: compactionPlanningConfigHash(config),
|
|
Eligible: eligible,
|
|
}
|
|
}
|
|
|
|
if operationRequested(ops, "rewrite_manifests") {
|
|
index.RewriteManifests = &planningIndexRewriteManifests{
|
|
Threshold: config.MinManifestsToRewrite,
|
|
Eligible: index.DataManifestCount >= config.MinManifestsToRewrite,
|
|
}
|
|
}
|
|
|
|
return index, nil
|
|
}
|
|
|
|
func persistPlanningIndex(
|
|
ctx context.Context,
|
|
client filer_pb.SeaweedFilerClient,
|
|
bucketName, tablePath string,
|
|
index *planningIndex,
|
|
) error {
|
|
if index == nil {
|
|
return nil
|
|
}
|
|
|
|
tableDir := path.Join(s3tables.TablesPath, bucketName, tablePath)
|
|
tableName := path.Base(tableDir)
|
|
parentDir := path.Dir(tableDir)
|
|
|
|
resp, err := filer_pb.LookupEntry(ctx, client, &filer_pb.LookupDirectoryEntryRequest{
|
|
Directory: parentDir,
|
|
Name: tableName,
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("lookup table entry: %w", err)
|
|
}
|
|
if resp == nil || resp.Entry == nil {
|
|
return fmt.Errorf("table entry not found")
|
|
}
|
|
|
|
existingXattr, ok := resp.Entry.Extended[s3tables.ExtendedKeyMetadata]
|
|
if !ok || len(existingXattr) == 0 {
|
|
return fmt.Errorf("no metadata xattr on table entry")
|
|
}
|
|
|
|
var internalMeta map[string]json.RawMessage
|
|
if err := json.Unmarshal(existingXattr, &internalMeta); err != nil {
|
|
return fmt.Errorf("unmarshal metadata xattr: %w", err)
|
|
}
|
|
if _, _, existingIndex, err := parseTableMetadataEnvelope(existingXattr); err == nil {
|
|
index = mergePlanningIndexSections(index, existingIndex)
|
|
}
|
|
|
|
indexJSON, err := json.Marshal(index)
|
|
if err != nil {
|
|
return fmt.Errorf("marshal planning index: %w", err)
|
|
}
|
|
internalMeta["planningIndex"] = indexJSON
|
|
|
|
updatedXattr, err := json.Marshal(internalMeta)
|
|
if err != nil {
|
|
return fmt.Errorf("marshal updated metadata xattr: %w", err)
|
|
}
|
|
|
|
expectedExtended := map[string][]byte{
|
|
s3tables.ExtendedKeyMetadata: existingXattr,
|
|
}
|
|
if expectedVersionXattr, ok := resp.Entry.Extended[s3tables.ExtendedKeyMetadataVersion]; ok && len(expectedVersionXattr) > 0 {
|
|
expectedExtended[s3tables.ExtendedKeyMetadataVersion] = expectedVersionXattr
|
|
}
|
|
resp.Entry.Extended[s3tables.ExtendedKeyMetadata] = updatedXattr
|
|
_, err = client.UpdateEntry(ctx, &filer_pb.UpdateEntryRequest{
|
|
Directory: parentDir,
|
|
Entry: resp.Entry,
|
|
ExpectedExtended: expectedExtended,
|
|
})
|
|
if err != nil {
|
|
if status.Code(err) == codes.FailedPrecondition {
|
|
return nil
|
|
}
|
|
return fmt.Errorf("update table entry: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|