diff --git a/extern/sector-storage/manager.go b/extern/sector-storage/manager.go index 52e079d75..c56bbdf50 100644 --- a/extern/sector-storage/manager.go +++ b/extern/sector-storage/manager.go @@ -58,6 +58,10 @@ type SectorManager interface { type WorkerID uuid.UUID // worker session UUID var ClosedWorkerID = uuid.UUID{} +func (w WorkerID) String() string { + return uuid.UUID(w).String() +} + type Manager struct { ls stores.LocalStorage storage *stores.Remote diff --git a/extern/sector-storage/sched_resources.go b/extern/sector-storage/sched_resources.go index 10fe29aae..3e359c121 100644 --- a/extern/sector-storage/sched_resources.go +++ b/extern/sector-storage/sched_resources.go @@ -49,25 +49,25 @@ func (a *activeResources) canHandleRequest(needRes Resources, wid WorkerID, call // TODO: dedupe needRes.BaseMinMemory per task type (don't add if that task is already running) minNeedMem := res.MemReserved + a.memUsedMin + needRes.MinMemory + needRes.BaseMinMemory if minNeedMem > res.MemPhysical { - log.Debugf("sched: not scheduling on worker %d for %s; not enough physical memory - need: %dM, have %dM", wid, caller, minNeedMem/mib, res.MemPhysical/mib) + log.Debugf("sched: not scheduling on worker %s for %s; not enough physical memory - need: %dM, have %dM", wid, caller, minNeedMem/mib, res.MemPhysical/mib) return false } maxNeedMem := res.MemReserved + a.memUsedMax + needRes.MaxMemory + needRes.BaseMinMemory if maxNeedMem > res.MemSwap+res.MemPhysical { - log.Debugf("sched: not scheduling on worker %d for %s; not enough virtual memory - need: %dM, have %dM", wid, caller, maxNeedMem/mib, (res.MemSwap+res.MemPhysical)/mib) + log.Debugf("sched: not scheduling on worker %s for %s; not enough virtual memory - need: %dM, have %dM", wid, caller, maxNeedMem/mib, (res.MemSwap+res.MemPhysical)/mib) return false } if a.cpuUse+needRes.Threads(res.CPUs) > res.CPUs { - log.Debugf("sched: not scheduling on worker %d for %s; not enough threads, need %d, %d in use, target %d", wid, caller, needRes.Threads(res.CPUs), a.cpuUse, res.CPUs) + log.Debugf("sched: not scheduling on worker %s for %s; not enough threads, need %d, %d in use, target %d", wid, caller, needRes.Threads(res.CPUs), a.cpuUse, res.CPUs) return false } if len(res.GPUs) > 0 && needRes.CanGPU { if a.gpuUsed { - log.Debugf("sched: not scheduling on worker %d for %s; GPU in use", wid, caller) + log.Debugf("sched: not scheduling on worker %s for %s; GPU in use", wid, caller) return false } } diff --git a/extern/sector-storage/sched_worker.go b/extern/sector-storage/sched_worker.go index 67bddca3a..7e60cd01b 100644 --- a/extern/sector-storage/sched_worker.go +++ b/extern/sector-storage/sched_worker.go @@ -486,6 +486,6 @@ func (sh *scheduler) workerCleanup(wid WorkerID, w *workerHandle) { } sh.openWindows = newWindows - log.Debugf("worker %d dropped", wid) + log.Debugf("worker %s dropped", wid) } }