21258: Fix log message.
authorTom Clegg <tom@curii.com>
Thu, 4 Jan 2024 15:19:22 +0000 (10:19 -0500)
committerTom Clegg <tom@curii.com>
Thu, 4 Jan 2024 15:19:22 +0000 (10:19 -0500)
Reverts an unintentional logging change in
1875af9bcf4a1afe435176e952e63341a9ae9c03 from

msg="creating new instance" InstanceType="type8" ...

to

msg="creating new instance" InstanceType="{type8 providertype8 8 8589934592 0 0 0 0.984 false {  0}}" ...

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

lib/dispatchcloud/scheduler/run_queue.go

index 2f1f17589029dfea32f2a44ac25f0a65f0ee017e..03fa592777e6fa7c09eb57031bb19c3bdeb80029 100644 (file)
@@ -239,7 +239,7 @@ tryrun:
                                // so mark it as allocated, and try to
                                // start the container.
                                unalloc[unallocType]--
-                               logger = logger.WithField("InstanceType", unallocType)
+                               logger = logger.WithField("InstanceType", unallocType.Name)
                                if dontstart[unallocType] {
                                        // We already tried & failed to start
                                        // a higher-priority container on the
@@ -282,7 +282,7 @@ tryrun:
                                logger.Trace("all eligible types at capacity")
                                continue
                        }
-                       logger = logger.WithField("InstanceType", availableType)
+                       logger = logger.WithField("InstanceType", availableType.Name)
                        if !sch.pool.Create(availableType) {
                                // Failed despite not being at quota,
                                // e.g., cloud ops throttled.