ExternalVendorCode/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI.git synced 2025-05-18 00:12:55 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

fix(watchdog): use ShutdownModel instead of StopModel (#1882)

Browse Source 
Fixes #1760
This commit is contained in:
Ettore Di Giacinto 2024-03-23 16:19:57 +01:00 committed by GitHub
parent 49cec7fd61
commit bd25d8049c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/loader.go
View File

@ -155,10 +155,10 @@ func (ml *ModelLoader) ShutdownModel(modelName string) error {
ml.mu.Lock() ml.mu.Lock()
defer ml.mu.Unlock() defer ml.mu.Unlock()
return ml.StopModel(modelName) return ml.stopModel(modelName)
} }
func (ml *ModelLoader) StopModel(modelName string) error { func (ml *ModelLoader) stopModel(modelName string) error {
defer ml.deleteProcess(modelName) defer ml.deleteProcess(modelName)
if _, ok := ml.models[modelName]; !ok { if _, ok := ml.models[modelName]; !ok {
return fmt.Errorf("model %s not found", modelName) return fmt.Errorf("model %s not found", modelName)

9
pkg/model/watchdog.go
View File

@ -30,7 +30,7 @@ type WatchDog struct {
} }
type ProcessManager interface { type ProcessManager interface {
StopModel(modelName string) error ShutdownModel(modelName string) error
} }
func NewWatchDog(pm ProcessManager, timeoutBusy, timeoutIdle time.Duration, busy, idle bool) *WatchDog { func NewWatchDog(pm ProcessManager, timeoutBusy, timeoutIdle time.Duration, busy, idle bool) *WatchDog {
@ -112,9 +112,10 @@ func (wd *WatchDog) checkIdle() {
log.Warn().Msgf("[WatchDog] Address %s is idle for too long, killing it", address) log.Warn().Msgf("[WatchDog] Address %s is idle for too long, killing it", address)
p, ok := wd.addressModelMap[address] p, ok := wd.addressModelMap[address]
if ok { if ok {
if err := wd.pm.StopModel(p); err != nil { if err := wd.pm.ShutdownModel(p); err != nil {
log.Error().Msgf("[watchdog] Error shutting down model %s: %v", p, err) log.Error().Msgf("[watchdog] Error shutting down model %s: %v", p, err)
} }
log.Debug().Msgf("[WatchDog] model shut down: %s", address)
delete(wd.idleTime, address) delete(wd.idleTime, address)
delete(wd.addressModelMap, address) delete(wd.addressModelMap, address)
delete(wd.addressMap, address) delete(wd.addressMap, address)
@ -139,9 +140,10 @@ func (wd *WatchDog) checkBusy() {
model, ok := wd.addressModelMap[address] model, ok := wd.addressModelMap[address]
if ok { if ok {
log.Warn().Msgf("[WatchDog] Model %s is busy for too long, killing it", model) log.Warn().Msgf("[WatchDog] Model %s is busy for too long, killing it", model)
if err := wd.pm.StopModel(model); err != nil { if err := wd.pm.ShutdownModel(model); err != nil {
log.Error().Msgf("[watchdog] Error shutting down model %s: %v", model, err) log.Error().Msgf("[watchdog] Error shutting down model %s: %v", model, err)
} }
log.Debug().Msgf("[WatchDog] model shut down: %s", address)
delete(wd.timetable, address) delete(wd.timetable, address)
delete(wd.addressModelMap, address) delete(wd.addressModelMap, address)
delete(wd.addressMap, address) delete(wd.addressMap, address)
@ -149,7 +151,6 @@ func (wd *WatchDog) checkBusy() {
log.Warn().Msgf("[WatchDog] Address %s unresolvable", address) log.Warn().Msgf("[WatchDog] Address %s unresolvable", address)
delete(wd.timetable, address) delete(wd.timetable, address)
} }
} }
} }
} }