Mathis/llamactl
1
0
Fork 0
mirror of https://github.com/lordmathis/llamactl.git synced 2025-11-06 00:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch manager to global app config

Browse Source
This commit is contained in:
Matúš Námešný
2025-10-25 00:14:12 +02:00
parent eff59a86fd
commit 58f8861d17
4 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/server/main.go
View File

@@ -58,7 +58,7 @@ func main() {
} }
// Initialize the instance manager // Initialize the instance manager
instanceManager := manager.New(cfg.Backends, cfg.Instances, cfg.Nodes, cfg.LocalNode) instanceManager := manager.New(&cfg)
// Create a new handler with the instance manager // Create a new handler with the instance manager
handler := server.NewHandler(instanceManager, cfg) handler := server.NewHandler(instanceManager, cfg)

3
pkg/instance/instance.go
View File

@@ -30,11 +30,12 @@ type Instance struct {
} }
// New creates a new instance with the given name, log path, options and local node name // New creates a new instance with the given name, log path, options and local node name
func New(name string, globalConfig *config.AppConfig, opts *Options, localNodeName string, onStatusChange func(oldStatus, newStatus Status)) *Instance { func New(name string, globalConfig *config.AppConfig, opts *Options, onStatusChange func(oldStatus, newStatus Status)) *Instance {
globalInstanceSettings := &globalConfig.Instances globalInstanceSettings := &globalConfig.Instances
globalBackendSettings := &globalConfig.Backends globalBackendSettings := &globalConfig.Backends
globalNodesConfig := globalConfig.Nodes globalNodesConfig := globalConfig.Nodes
localNodeName := globalConfig.LocalNode
// Validate and copy options // Validate and copy options
opts.validateAndApplyDefaults(name, globalInstanceSettings) opts.validateAndApplyDefaults(name, globalInstanceSettings)

27
pkg/manager/manager.go
View File

@@ -35,9 +35,7 @@ type instanceManager struct {
lifecycle *lifecycleManager lifecycle *lifecycleManager
// Configuration // Configuration
instancesConfig config.InstancesConfig globalConfig *config.AppConfig
backendsConfig config.BackendConfig
localNodeName string // Name of the local node
// Synchronization // Synchronization
instanceLocks sync.Map // map[string]*sync.Mutex - per-instance locks for concurrent operations instanceLocks sync.Map // map[string]*sync.Mutex - per-instance locks for concurrent operations
@@ -45,29 +43,30 @@ type instanceManager struct {
} }
// New creates a new instance of InstanceManager. // New creates a new instance of InstanceManager.
func New(backendsConfig config.BackendConfig, instancesConfig config.InstancesConfig, nodesConfig map[string]config.NodeConfig, localNodeName string) InstanceManager { func New(globalConfig *config.AppConfig) InstanceManager {
if instancesConfig.TimeoutCheckInterval <= 0 {
instancesConfig.TimeoutCheckInterval = 5 // Default to 5 minutes if not set if globalConfig.Instances.TimeoutCheckInterval <= 0 {
globalConfig.Instances.TimeoutCheckInterval = 5 // Default to 5 minutes if not set
} }
// Initialize components // Initialize components
registry := newInstanceRegistry() registry := newInstanceRegistry()
// Initialize port allocator // Initialize port allocator
portRange := instancesConfig.PortRange portRange := globalConfig.Instances.PortRange
ports, err := newPortAllocator(portRange[0], portRange[1]) ports, err := newPortAllocator(portRange[0], portRange[1])
if err != nil { if err != nil {
log.Fatalf("Failed to create port allocator: %v", err) log.Fatalf("Failed to create port allocator: %v", err)
} }
// Initialize persistence // Initialize persistence
persistence, err := newInstancePersister(instancesConfig.InstancesDir) persistence, err := newInstancePersister(globalConfig.Instances.InstancesDir)
if err != nil { if err != nil {
log.Fatalf("Failed to create instance persister: %v", err) log.Fatalf("Failed to create instance persister: %v", err)
} }
// Initialize remote manager // Initialize remote manager
remote := newRemoteManager(nodesConfig, 30*time.Second) remote := newRemoteManager(globalConfig.Nodes, 30*time.Second)
// Create manager instance // Create manager instance
im := &instanceManager{ im := &instanceManager{
@@ -75,13 +74,11 @@ func New(backendsConfig config.BackendConfig, instancesConfig config.InstancesCo
ports: ports, ports: ports,
persistence: persistence, persistence: persistence,
remote: remote, remote: remote,
instancesConfig: instancesConfig, globalConfig: globalConfig,
backendsConfig: backendsConfig,
localNodeName: localNodeName,
} }
// Initialize lifecycle manager (needs reference to manager for Stop/Evict operations) // Initialize lifecycle manager (needs reference to manager for Stop/Evict operations)
checkInterval := time.Duration(instancesConfig.TimeoutCheckInterval) * time.Minute checkInterval := time.Duration(globalConfig.Instances.TimeoutCheckInterval) * time.Minute
im.lifecycle = newLifecycleManager(registry, im, checkInterval, true) im.lifecycle = newLifecycleManager(registry, im, checkInterval, true)
// Load existing instances from disk // Load existing instances from disk
@@ -165,7 +162,7 @@ func (im *instanceManager) loadInstance(persistedInst *instance.Instance) error
var isRemote bool var isRemote bool
var nodeName string var nodeName string
if options != nil { if options != nil {
if _, isLocal := options.Nodes[im.localNodeName]; !isLocal && len(options.Nodes) > 0 { if _, isLocal := options.Nodes[im.globalConfig.LocalNode]; !isLocal && len(options.Nodes) > 0 {
// Get the first node from the set // Get the first node from the set
for node := range options.Nodes { for node := range options.Nodes {
nodeName = node nodeName = node
@@ -184,7 +181,7 @@ func (im *instanceManager) loadInstance(persistedInst *instance.Instance) error
} }
// Create new inst using NewInstance (handles validation, defaults, setup) // Create new inst using NewInstance (handles validation, defaults, setup)
inst := instance.New(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, statusCallback) inst := instance.New(name, im.globalConfig, options, statusCallback)
// Restore persisted fields that NewInstance doesn't set // Restore persisted fields that NewInstance doesn't set
inst.Created = persistedInst.Created inst.Created = persistedInst.Created

16
pkg/manager/operations.go
View File

@@ -68,7 +68,7 @@ func (im *instanceManager) CreateInstance(name string, options *instance.Options
} }
// Check if this is a remote instance (local node not in the Nodes set) // Check if this is a remote instance (local node not in the Nodes set)
if _, isLocal := options.Nodes[im.localNodeName]; !isLocal && len(options.Nodes) > 0 { if _, isLocal := options.Nodes[im.globalConfig.LocalNode]; !isLocal && len(options.Nodes) > 0 {
// Get the first node from the set // Get the first node from the set
var nodeName string var nodeName string
for node := range options.Nodes { for node := range options.Nodes {
@@ -94,7 +94,7 @@ func (im *instanceManager) CreateInstance(name string, options *instance.Options
// Create a local stub that preserves the Nodes field for tracking // Create a local stub that preserves the Nodes field for tracking
// We keep the original options (with Nodes) so IsRemote() works correctly // We keep the original options (with Nodes) so IsRemote() works correctly
inst := instance.New(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, nil) inst := instance.New(name, im.globalConfig, options, nil)
// Update the local stub with all remote data (preserving Nodes) // Update the local stub with all remote data (preserving Nodes)
im.updateLocalInstanceFromRemote(inst, remoteInst) im.updateLocalInstanceFromRemote(inst, remoteInst)
@@ -129,8 +129,8 @@ func (im *instanceManager) CreateInstance(name string, options *instance.Options
} }
} }
localInstanceCount := totalInstances - remoteCount localInstanceCount := totalInstances - remoteCount
if localInstanceCount >= im.instancesConfig.MaxInstances && im.instancesConfig.MaxInstances != -1 { if localInstanceCount >= im.globalConfig.Instances.MaxInstances && im.globalConfig.Instances.MaxInstances != -1 {
return nil, fmt.Errorf("maximum number of instances (%d) reached", im.instancesConfig.MaxInstances) return nil, fmt.Errorf("maximum number of instances (%d) reached", im.globalConfig.Instances.MaxInstances)
} }
// Assign and validate port for backend-specific options // Assign and validate port for backend-specific options
@@ -155,7 +155,7 @@ func (im *instanceManager) CreateInstance(name string, options *instance.Options
im.onStatusChange(name, oldStatus, newStatus) im.onStatusChange(name, oldStatus, newStatus)
} }
inst := instance.New(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, statusCallback) inst := instance.New(name, im.globalConfig, options, statusCallback)
// Add to registry // Add to registry
if err := im.registry.add(inst); err != nil { if err := im.registry.add(inst); err != nil {
@@ -384,7 +384,7 @@ func (im *instanceManager) StartInstance(name string) (*instance.Instance, error
// Check max running instances limit for local instances only // Check max running instances limit for local instances only
if im.IsMaxRunningInstancesReached() { if im.IsMaxRunningInstancesReached() {
return nil, MaxRunningInstancesError(fmt.Errorf("maximum number of running instances (%d) reached", im.instancesConfig.MaxRunningInstances)) return nil, MaxRunningInstancesError(fmt.Errorf("maximum number of running instances (%d) reached", im.globalConfig.Instances.MaxRunningInstances))
} }
if err := inst.Start(); err != nil { if err := inst.Start(); err != nil {
@@ -400,7 +400,7 @@ func (im *instanceManager) StartInstance(name string) (*instance.Instance, error
} }
func (im *instanceManager) IsMaxRunningInstancesReached() bool { func (im *instanceManager) IsMaxRunningInstancesReached() bool {
if im.instancesConfig.MaxRunningInstances == -1 { if im.globalConfig.Instances.MaxRunningInstances == -1 {
return false return false
} }
@@ -412,7 +412,7 @@ func (im *instanceManager) IsMaxRunningInstancesReached() bool {
} }
} }
return localRunningCount >= im.instancesConfig.MaxRunningInstances return localRunningCount >= im.globalConfig.Instances.MaxRunningInstances
} }
// StopInstance stops a running instance and returns it. // StopInstance stops a running instance and returns it.