diff --git a/go/seat.go b/go/seat.go index c903143f..f6ff2e11 100644 --- a/go/seat.go +++ b/go/seat.go @@ -266,11 +266,13 @@ func subjectMatches(pattern, subject string) bool { } // WaitingAsk is one ask waiting in a seat's work queue, as the runtime reads it without taking it (design 47 H2 ยง777, -// H-A-410): the ask's id, the module that asked it and its age in seconds. +// H-A-410): the ask's id, the module that asked it and its age in seconds. Again says it was handed out and handed back +// (a nak) and no worker holds it: waiting again (H-A-410's addendum). type WaitingAsk struct { ID string `json:"id"` Module string `json:"module"` AgeSeconds float64 `json:"age_seconds"` + Again bool `json:"again,omitempty"` } // Waiting is the asks waiting in a seat's work queue, oldest first as the queue holds them; Capped says the runtime cut diff --git a/go/state_history_test.go b/go/state_history_test.go index 8b34c95c..a14c2919 100644 --- a/go/state_history_test.go +++ b/go/state_history_test.go @@ -158,7 +158,7 @@ func TestInfoIsTheBucketsFillAgainstItsCaps(t *testing.T) { return map[string]any{"error": map[string]any{"code": -32000, "message": "issued no queue of that seat"}} } return map[string]any{"result": map[string]any{"asks": []map[string]any{{"id": "main.9", "module": "mesh-delivery-pipeline", - "age_seconds": 42}, {"id": "main.10", "module": "mesh-delivery-pipeline", "age_seconds": 1.5}}, "capped": true}} + "age_seconds": 42}, {"id": "main.10", "module": "mesh-delivery-pipeline", "age_seconds": 1.5, "again": true}}, "capped": true}} } if p["state"] != "issues" { return map[string]any{"error": map[string]any{"code": -32000, "message": "issues was issued no state"}} @@ -180,7 +180,7 @@ func TestInfoIsTheBucketsFillAgainstItsCaps(t *testing.T) { _, waitingRefused = QueueWaiting("node-build-go") }) if w := waiting; !w.Capped || len(w.Asks) != 2 || w.Asks[0] != (WaitingAsk{ID: "main.9", Module: "mesh-delivery-pipeline", AgeSeconds: 42}) || - w.Asks[1].AgeSeconds != 1.5 { + w.Asks[1] != (WaitingAsk{ID: "main.10", Module: "mesh-delivery-pipeline", AgeSeconds: 1.5, Again: true}) { t.Errorf("the waiting asks are %+v", w) } if waitingRefused == nil || !strings.Contains(waitingRefused.Error(), "issued no queue") {