* feat: introduce scheduler lanes for independent per-workload scheduling
Split the single plugin scheduler loop into independent per-lane
goroutines so that volume management, iceberg compaction, and lifecycle
operations never block each other.
Each lane has its own:
- Goroutine (laneSchedulerLoop)
- Wake channel for immediate scheduling
- Admin lock scope (e.g. "plugin scheduler:default")
- Configurable idle sleep duration
- Loop state tracking
Three lanes are defined:
- default: vacuum, volume_balance, ec_balance, erasure_coding, admin_script
- iceberg: iceberg_maintenance
- lifecycle: s3_lifecycle (new, handler coming in a later commit)
Job types are mapped to lanes via a hardcoded map with LaneDefault as
the fallback. The SchedulerJobTypeState and SchedulerStatus types now
include a Lane field for API consumers.
* feat: per-lane execution reservation pools for resource isolation
Each scheduler lane now maintains its own execution reservation map
so that a busy volume lane cannot consume execution slots needed by
iceberg or lifecycle lanes. The per-lane pool is used by default when
dispatching jobs through the lane scheduler; the global pool remains
as a fallback for the public DispatchProposals API.
* feat: add per-lane scheduler status API and lane worker UI pages
- GET /api/plugin/lanes returns all lanes with status and job types
- GET /api/plugin/workers?lane=X filters workers by lane
- GET /api/plugin/scheduler-states?lane=X filters job types by lane
- GET /api/plugin/scheduler-status?lane=X returns lane-scoped status
- GET /plugin/lanes/{lane}/workers renders per-lane worker page
- SchedulerJobTypeState now includes a "lane" field
The lane worker pages show scheduler status, job type configuration,
and connected workers scoped to a single lane, with links back to
the main plugin overview.
* feat: add s3_lifecycle worker handler for object store lifecycle management
Implements a full plugin worker handler for S3 lifecycle management,
assigned to the new "lifecycle" scheduler lane.
Detection phase:
- Reads filer.conf to find buckets with TTL lifecycle rules
- Creates one job proposal per bucket with active lifecycle rules
- Supports bucket_filter wildcard pattern from admin config
Execution phase:
- Walks the bucket directory tree breadth-first
- Identifies expired objects by checking TtlSec + Crtime < now
- Deletes expired objects in configurable batches
- Reports progress with scanned/expired/error counts
- Supports dry_run mode for safe testing
Configurable via admin UI:
- batch_size: entries per filer listing page (default 1000)
- max_deletes_per_bucket: safety cap per run (default 10000)
- dry_run: detect without deleting
- delete_marker_cleanup: clean expired delete markers
- abort_mpu_days: abort stale multipart uploads
The handler integrates with the existing PutBucketLifecycle flow which
sets TtlSec on entries via filer.conf path rules.
* feat: add per-lane submenu items under Workers sidebar menu
Replace the single "Workers" sidebar link with a collapsible submenu
containing three lane entries:
- Default (volume management + admin scripts) -> /plugin
- Iceberg (table compaction) -> /plugin/lanes/iceberg/workers
- Lifecycle (S3 object expiration) -> /plugin/lanes/lifecycle/workers
The submenu auto-expands when on any /plugin page and highlights the
active lane. Icons match each lane's job type descriptor (server,
snowflake, hourglass).
* feat: scope plugin pages to their scheduler lane
The plugin overview, configuration, detection, queue, and execution
pages now filter workers, job types, scheduler states, and scheduler
status to only show data for their lane.
- Plugin() templ function accepts a lane parameter (default: "default")
- JavaScript appends ?lane= to /api/plugin/workers, /job-types,
/scheduler-states, and /scheduler-status API calls
- GET /api/plugin/job-types now supports ?lane= filtering
- When ?job= is provided (e.g. ?job=iceberg_maintenance), the lane is
auto-derived from the job type so the page scopes correctly
This ensures /plugin shows only default-lane workers and
/plugin/configuration?job=iceberg_maintenance scopes to the iceberg lane.
* fix: remove "Lane" from lane worker page titles and capitalize properly
"lifecycle Lane Workers" -> "Lifecycle Workers"
"iceberg Lane Workers" -> "Iceberg Workers"
* refactor: promote lane items to top-level sidebar menu entries
Move Default, Iceberg, and Lifecycle from a collapsible submenu to
direct top-level items under the WORKERS heading. Removes the
intermediate "Workers" parent link and collapse toggle.
* admin: unify plugin lane routes and handlers
* admin: filter plugin jobs and activities by lane
* admin: reuse plugin UI for worker lane pages
* fix: use ServerAddress.ToGrpcAddress() for filer connections in lifecycle handler
ClusterContext addresses use ServerAddress format (host:port.grpcPort).
Convert to the actual gRPC address via ToGrpcAddress() before dialing,
and add a Ping verification after connecting.
Fixes: "dial tcp: lookup tcp/8888.18888: unknown port"
* fix: resolve ServerAddress gRPC port in iceberg and lifecycle filer connections
ClusterContext addresses use ServerAddress format (host:httpPort.grpcPort).
Both the iceberg and lifecycle handlers now detect the compound format
and extract the gRPC port via ToGrpcAddress() before dialing. Plain
host:port addresses (e.g. from tests) are passed through unchanged.
Fixes: "dial tcp: lookup tcp/8888.18888: unknown port"
* align url
* Potential fix for code scanning alert no. 335: Incorrect conversion between integer types
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
* fix: address PR review findings across scheduler lanes and lifecycle handler
- Fix variable shadowing: rename loop var `w` to `worker` in
GetPluginWorkersAPI to avoid shadowing the http.ResponseWriter param
- Fix stale GetSchedulerStatus: aggregate loop states across all lanes
instead of reading never-updated legacy schedulerLoopState
- Scope InProcessJobs to lane in GetLaneSchedulerStatus
- Fix AbortMPUDays=0 treated as unset: change <= 0 to < 0 so 0 disables
- Propagate listing errors in lifecycle bucket walk instead of swallowing
- Implement DeleteMarkerCleanup: scan for S3 delete marker entries and
remove them
- Implement AbortMPUDays: scan .uploads directory and remove stale
multipart uploads older than the configured threshold
- Fix success determination: mark job failed when result.errors > 0
even if no fatal error occurred
- Add regression test for jobTypeLaneMap to catch drift from handler
registrations
* fix: guard against nil result in lifecycle completion and trim filer addresses
- Guard result dereference in completion summary: use local vars
defaulting to 0 when result is nil to prevent panic
- Append trimmed filer addresses instead of originals so whitespace
is not passed to the gRPC dialer
* fix: propagate ctx cancellation from deleteExpiredObjects and add config logging
- deleteExpiredObjects now returns a third error value when the context
is canceled mid-batch; the caller stops processing further batches
and returns the cancellation error to the job completion handler
- readBoolConfig and readInt64Config now log unexpected ConfigValue
types at V(1) for debugging, consistent with readStringConfig
* fix: propagate errors in lifecycle cleanup helpers and use correct delete marker key
- cleanupDeleteMarkers: return error on ctx cancellation and SeaweedList
failures instead of silently continuing
- abortIncompleteMPUs: log SeaweedList errors instead of discarding
- isDeleteMarker: use ExtDeleteMarkerKey ("Seaweed-X-Amz-Delete-Marker")
instead of ExtLatestVersionIsDeleteMarker which is for the parent entry
- batchSize cap: use math.MaxInt instead of math.MaxInt32
* fix: propagate ctx cancellation from abortIncompleteMPUs and log unrecognized bool strings
- abortIncompleteMPUs now returns (aborted, errors, ctxErr) matching
cleanupDeleteMarkers; caller stops on cancellation or listing failure
- readBoolConfig logs unrecognized string values before falling back
* fix: shared per-bucket budget across lifecycle phases and allow cleanup without expired objects
- Thread a shared remaining counter through TTL deletion, delete marker
cleanup, and MPU abort so the total operations per bucket never exceed
MaxDeletesPerBucket
- Remove early return when no TTL-expired objects found so delete marker
cleanup and MPU abort still run
- Add NOTE on cleanupDeleteMarkers about version-safety limitation
---------
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
110 lines
3.3 KiB
Go
110 lines
3.3 KiB
Go
package plugin
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// SchedulerLane identifies an independent scheduling track. Each lane runs
|
|
// its own goroutine, maintains its own detection timing, and acquires its
|
|
// own admin lock so that workloads in different lanes never block each other.
|
|
type SchedulerLane string
|
|
|
|
const (
|
|
// LaneDefault handles volume management operations (vacuum, balance,
|
|
// erasure coding) and admin scripts. It is the fallback lane for any
|
|
// job type that is not explicitly mapped elsewhere.
|
|
LaneDefault SchedulerLane = "default"
|
|
|
|
// LaneIceberg handles table-bucket Iceberg compaction and maintenance.
|
|
LaneIceberg SchedulerLane = "iceberg"
|
|
|
|
// LaneLifecycle handles S3 object store lifecycle management
|
|
// (expiration, transition, abort incomplete multipart uploads).
|
|
LaneLifecycle SchedulerLane = "lifecycle"
|
|
)
|
|
|
|
// AllLanes returns every defined scheduler lane in a stable order.
|
|
func AllLanes() []SchedulerLane {
|
|
return []SchedulerLane{LaneDefault, LaneIceberg, LaneLifecycle}
|
|
}
|
|
|
|
// laneIdleSleep maps each lane to its default idle sleep duration.
|
|
// Each lane can sleep for a different amount when no work is detected,
|
|
// independent of the per-job-type DetectionInterval.
|
|
var laneIdleSleep = map[SchedulerLane]time.Duration{
|
|
LaneDefault: 61 * time.Second,
|
|
LaneIceberg: 61 * time.Second,
|
|
LaneLifecycle: 5 * time.Minute,
|
|
}
|
|
|
|
// LaneIdleSleep returns the idle sleep duration for the given lane,
|
|
// falling back to defaultSchedulerIdleSleep if the lane is unknown.
|
|
func LaneIdleSleep(lane SchedulerLane) time.Duration {
|
|
if d, ok := laneIdleSleep[lane]; ok {
|
|
return d
|
|
}
|
|
return defaultSchedulerIdleSleep
|
|
}
|
|
|
|
// jobTypeLaneMap is the hardcoded mapping from job type to scheduler lane.
|
|
// Job types not present here are assigned to LaneDefault.
|
|
var jobTypeLaneMap = map[string]SchedulerLane{
|
|
// Volume management (default lane)
|
|
"vacuum": LaneDefault,
|
|
"volume_balance": LaneDefault,
|
|
"ec_balance": LaneDefault,
|
|
"erasure_coding": LaneDefault,
|
|
"admin_script": LaneDefault,
|
|
|
|
// Iceberg table maintenance
|
|
"iceberg_maintenance": LaneIceberg,
|
|
|
|
// S3 lifecycle management
|
|
"s3_lifecycle": LaneLifecycle,
|
|
}
|
|
|
|
// JobTypeLane returns the scheduler lane for the given job type.
|
|
// Unknown job types are assigned to LaneDefault.
|
|
func JobTypeLane(jobType string) SchedulerLane {
|
|
if lane, ok := jobTypeLaneMap[jobType]; ok {
|
|
return lane
|
|
}
|
|
return LaneDefault
|
|
}
|
|
|
|
// LaneJobTypes returns the set of known job types assigned to the given lane.
|
|
func LaneJobTypes(lane SchedulerLane) []string {
|
|
var result []string
|
|
for jobType, l := range jobTypeLaneMap {
|
|
if l == lane {
|
|
result = append(result, jobType)
|
|
}
|
|
}
|
|
return result
|
|
}
|
|
|
|
// schedulerLaneState holds the per-lane runtime state used by the scheduler.
|
|
type schedulerLaneState struct {
|
|
lane SchedulerLane
|
|
wakeCh chan struct{}
|
|
|
|
loopMu sync.Mutex
|
|
loop schedulerLoopState
|
|
|
|
// Per-lane execution reservation pool. Each lane tracks how many
|
|
// execution slots it has reserved on each worker independently,
|
|
// so lanes cannot starve each other.
|
|
execMu sync.Mutex
|
|
execRes map[string]int
|
|
}
|
|
|
|
// newLaneState creates a schedulerLaneState for the given lane.
|
|
func newLaneState(lane SchedulerLane) *schedulerLaneState {
|
|
return &schedulerLaneState{
|
|
lane: lane,
|
|
wakeCh: make(chan struct{}, 1),
|
|
execRes: make(map[string]int),
|
|
}
|
|
}
|