From 7a473402e61d8027c23f7bfc22b443d92cd6959b Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 2 Oct 2024 14:36:02 -0400 Subject: [PATCH] 22132: Wordsmithing and update docs Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- doc/api/dispatch.html.textile.liquid | 4 +-- lib/dispatchcloud/dispatcher_test.go | 36 ++++++++++++------------ lib/dispatchcloud/scheduler/run_queue.go | 6 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/api/dispatch.html.textile.liquid b/doc/api/dispatch.html.textile.liquid index cfe57640c4..a31bfcfbe7 100644 --- a/doc/api/dispatch.html.textile.liquid +++ b/doc/api/dispatch.html.textile.liquid @@ -58,7 +58,7 @@ Example response: "Price": 0.146, "Preemptible": false }, - "scheduling_status": "waiting for new instance to be ready" + "scheduling_status": "Waiting for a Standard_E2s_v3 instance to boot and be ready to accept work." }, ... ] @@ -79,7 +79,7 @@ Example response: "instance_type": { ... }, - "scheduling_status": "waiting for new instance to be ready" + "scheduling_status": "Waiting for a Standard_E2s_v3 instance to boot and be ready to accept work." } h3. Terminate a container diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go index 032abb277a..542c2789bd 100644 --- a/lib/dispatchcloud/dispatcher_test.go +++ b/lib/dispatchcloud/dispatcher_test.go @@ -434,24 +434,24 @@ func (s *DispatcherSuite) TestManagementAPI_Containers(c *check.C) { expect := ` 0 zzzzz-dz642-000000000000000 (Running) "" 1 zzzzz-dz642-000000000000001 (Running) "" - 2 zzzzz-dz642-000000000000002 (Locked) "Waiting in container queue at position 1. Cluster is at capacity for all the eligible instance types (type4, type6) and cannot start a new instance right now." - 3 zzzzz-dz642-000000000000003 (Locked) "Waiting in container queue at position 2. Cluster is at capacity for all the eligible instance types (type4, type6) and cannot start a new instance right now." - 4 zzzzz-dz642-000000000000004 (Queued) "Waiting in container queue at position 3. Cluster is at capacity and cannot start any new instances right now." - 5 zzzzz-dz642-000000000000005 (Queued) "Waiting in container queue at position 4. Cluster is at capacity and cannot start any new instances right now." - 6 zzzzz-dz642-000000000000006 (Queued) "Waiting in container queue at position 5. Cluster is at capacity and cannot start any new instances right now." - 7 zzzzz-dz642-000000000000007 (Queued) "Waiting in container queue at position 6. Cluster is at capacity and cannot start any new instances right now." - 8 zzzzz-dz642-000000000000008 (Queued) "Waiting in container queue at position 7. Cluster is at capacity and cannot start any new instances right now." - 9 zzzzz-dz642-000000000000009 (Queued) "Waiting in container queue at position 8. Cluster is at capacity and cannot start any new instances right now." - 10 zzzzz-dz642-000000000000010 (Queued) "Waiting in container queue at position 9. Cluster is at capacity and cannot start any new instances right now." - 11 zzzzz-dz642-000000000000011 (Queued) "Waiting in container queue at position 10. Cluster is at capacity and cannot start any new instances right now." - 12 zzzzz-dz642-000000000000012 (Queued) "Waiting in container queue at position 11. Cluster is at capacity and cannot start any new instances right now." - 13 zzzzz-dz642-000000000000013 (Queued) "Waiting in container queue at position 12. Cluster is at capacity and cannot start any new instances right now." - 14 zzzzz-dz642-000000000000014 (Queued) "Waiting in container queue at position 13. Cluster is at capacity and cannot start any new instances right now." - 15 zzzzz-dz642-000000000000015 (Queued) "Waiting in container queue at position 14. Cluster is at capacity and cannot start any new instances right now." - 16 zzzzz-dz642-000000000000016 (Queued) "Waiting in container queue at position 15. Cluster is at capacity and cannot start any new instances right now." - 17 zzzzz-dz642-000000000000017 (Queued) "Waiting in container queue at position 16. Cluster is at capacity and cannot start any new instances right now." - 18 zzzzz-dz642-000000000000018 (Queued) "Waiting in container queue at position 17. Cluster is at capacity and cannot start any new instances right now." - 19 zzzzz-dz642-000000000000019 (Queued) "Waiting in container queue at position 18. Cluster is at capacity and cannot start any new instances right now." + 2 zzzzz-dz642-000000000000002 (Locked) "Waiting in queue at position 1. Cluster is at capacity for all eligible instance types (type4, type6) and cannot start a new instance right now." + 3 zzzzz-dz642-000000000000003 (Locked) "Waiting in queue at position 2. Cluster is at capacity for all eligible instance types (type4, type6) and cannot start a new instance right now." + 4 zzzzz-dz642-000000000000004 (Queued) "Waiting in queue at position 3. Cluster is at capacity and cannot start any new instances right now." + 5 zzzzz-dz642-000000000000005 (Queued) "Waiting in queue at position 4. Cluster is at capacity and cannot start any new instances right now." + 6 zzzzz-dz642-000000000000006 (Queued) "Waiting in queue at position 5. Cluster is at capacity and cannot start any new instances right now." + 7 zzzzz-dz642-000000000000007 (Queued) "Waiting in queue at position 6. Cluster is at capacity and cannot start any new instances right now." + 8 zzzzz-dz642-000000000000008 (Queued) "Waiting in queue at position 7. Cluster is at capacity and cannot start any new instances right now." + 9 zzzzz-dz642-000000000000009 (Queued) "Waiting in queue at position 8. Cluster is at capacity and cannot start any new instances right now." + 10 zzzzz-dz642-000000000000010 (Queued) "Waiting in queue at position 9. Cluster is at capacity and cannot start any new instances right now." + 11 zzzzz-dz642-000000000000011 (Queued) "Waiting in queue at position 10. Cluster is at capacity and cannot start any new instances right now." + 12 zzzzz-dz642-000000000000012 (Queued) "Waiting in queue at position 11. Cluster is at capacity and cannot start any new instances right now." + 13 zzzzz-dz642-000000000000013 (Queued) "Waiting in queue at position 12. Cluster is at capacity and cannot start any new instances right now." + 14 zzzzz-dz642-000000000000014 (Queued) "Waiting in queue at position 13. Cluster is at capacity and cannot start any new instances right now." + 15 zzzzz-dz642-000000000000015 (Queued) "Waiting in queue at position 14. Cluster is at capacity and cannot start any new instances right now." + 16 zzzzz-dz642-000000000000016 (Queued) "Waiting in queue at position 15. Cluster is at capacity and cannot start any new instances right now." + 17 zzzzz-dz642-000000000000017 (Queued) "Waiting in queue at position 16. Cluster is at capacity and cannot start any new instances right now." + 18 zzzzz-dz642-000000000000018 (Queued) "Waiting in queue at position 17. Cluster is at capacity and cannot start any new instances right now." + 19 zzzzz-dz642-000000000000019 (Queued) "Waiting in queue at position 18. Cluster is at capacity and cannot start any new instances right now." ` sequence := make(map[string][]string) var summary string diff --git a/lib/dispatchcloud/scheduler/run_queue.go b/lib/dispatchcloud/scheduler/run_queue.go index c881edcbab..4561a29975 100644 --- a/lib/dispatchcloud/scheduler/run_queue.go +++ b/lib/dispatchcloud/scheduler/run_queue.go @@ -31,9 +31,9 @@ const ( schedStatusSupervisorLimitReached = "Waiting in workflow queue at position %v. Cluster is at capacity and cannot start any new workflows right now." schedStatusWaitingForPreviousAttempt = "Waiting for previous container attempt to exit." schedStatusWaitingNewInstance = "Waiting for a %v instance to boot and be ready to accept work." - schedStatusWaitingInstanceType = "Waiting in container queue at position %v. Cluster is at capacity for all the eligible instance types (%v) and cannot start a new instance right now." - schedStatusWaitingCloudResources = "Waiting in container queue at position %v. Cluster is at cloud account limits and cannot start any new instances right now." - schedStatusWaitingClusterCapacity = "Waiting in container queue at position %v. Cluster is at capacity and cannot start any new instances right now." + schedStatusWaitingInstanceType = "Waiting in queue at position %v. Cluster is at capacity for all eligible instance types (%v) and cannot start a new instance right now." + schedStatusWaitingCloudResources = "Waiting in queue at position %v. Cluster is at cloud account limits and cannot start any new instances right now." + schedStatusWaitingClusterCapacity = "Waiting in queue at position %v. Cluster is at capacity and cannot start any new instances right now." ) // Queue returns the sorted queue from the last scheduling iteration. -- 2.30.2