Extract opstate and dmsnap into subpackages
Two leaves of the daemon package that carry no back-references to Daemon move out: - internal/daemon/opstate: generic Registry[T AsyncOp]. The AsyncOp interface methods are capitalised (ID, IsDone, UpdatedAt, Cancel); vmCreateOperationState and imageBuildOperationState implement it. - internal/daemon/dmsnap: Create, Cleanup, Remove plus the Handles type for device-mapper snapshot lifecycle. Takes an explicit Runner interface. The daemon-package snapshot.go keeps thin forwarders and a type alias so existing call sites and tests are untouched. Skipped on purpose: tap_pool has too many Daemon-scoped dependencies (config, store, closing, createTap) for a clean extraction at this stage; nat.go is already a thin facade over internal/hostnat; dns_routing.go tests tightly couple to package internals, so extraction would be more churn than payoff. Each can be revisited when a subsystem-level refactor forces the boundary. All tests green. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
59f2766139
commit
fdab4a7e68
7 changed files with 214 additions and 170 deletions
58
internal/daemon/opstate/registry.go
Normal file
58
internal/daemon/opstate/registry.go
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
// Package opstate provides a mutex-guarded registry for long-running
|
||||
// operations (e.g. async VM create, async image build). A registry stores
|
||||
// operations by ID and can prune completed ones after a retention window.
|
||||
package opstate
|
||||
|
||||
import (
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// AsyncOp is the protocol each operation type must satisfy. Implementations
|
||||
// own their own concurrency for the returned values — the registry treats
|
||||
// them as opaque.
|
||||
type AsyncOp interface {
|
||||
ID() string
|
||||
IsDone() bool
|
||||
UpdatedAt() time.Time
|
||||
Cancel()
|
||||
}
|
||||
|
||||
// Registry is a mutex-guarded map of in-flight operations keyed by op ID.
|
||||
// One registry per operation kind; each owns its own lock.
|
||||
type Registry[T AsyncOp] struct {
|
||||
mu sync.Mutex
|
||||
byID map[string]T
|
||||
}
|
||||
|
||||
// Insert adds op keyed by its ID.
|
||||
func (r *Registry[T]) Insert(op T) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
if r.byID == nil {
|
||||
r.byID = map[string]T{}
|
||||
}
|
||||
r.byID[op.ID()] = op
|
||||
}
|
||||
|
||||
// Get returns the operation with the given ID, if present.
|
||||
func (r *Registry[T]) Get(id string) (T, bool) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
op, ok := r.byID[id]
|
||||
return op, ok
|
||||
}
|
||||
|
||||
// Prune drops completed operations last updated before the cutoff.
|
||||
func (r *Registry[T]) Prune(before time.Time) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
for id, op := range r.byID {
|
||||
if !op.IsDone() {
|
||||
continue
|
||||
}
|
||||
if op.UpdatedAt().Before(before) {
|
||||
delete(r.byID, id)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue