Bound each shutdown stage by the stop deadline (closes #100)
check / check (push) Canceled after 0s
check / check (push) Canceled after 0s
Shutdown passes its context to every stage: the streamer, the four handlers, the WHOIS fetcher, the database maintainer and the HTTP server each stop waiting when it ends. A handler then skips its last write and logs how many updates it did not write, and the HTTP server closes the connections still open. The database is checkpointed and closed last, and left open once the deadline has passed, since a write may still hold it. The stop hook gives Shutdown 8 seconds and fx 9, inside the 10 seconds upaas and docker stop allow, so a stop signal exits 0. Model: opus-5-5
This commit was merged in pull request #130.
This commit is contained in:
@@ -1,9 +1,12 @@
|
||||
package streamer
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"runtime"
|
||||
@@ -377,7 +380,7 @@ func TestStopQueuesTheHeldStateMessages(t *testing.T) {
|
||||
stopped := make(chan struct{})
|
||||
|
||||
go func() {
|
||||
s.Stop()
|
||||
s.Stop(t.Context())
|
||||
close(stopped)
|
||||
}()
|
||||
|
||||
@@ -412,6 +415,68 @@ func TestStopQueuesTheHeldStateMessages(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestStopReturnsByItsDeadline stops a streamer whose handler has a full queue
|
||||
// and a STATE message held for it, and a worker that stays busy until the test
|
||||
// ends, as one does whose handler waits for a database write. Stop must return
|
||||
// within its deadline plus a small margin instead of waiting for room on the
|
||||
// queue and for the worker, and log as not handed over the held message and
|
||||
// every message on the queue.
|
||||
func TestStopReturnsByItsDeadline(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
const (
|
||||
deadline = 100 * time.Millisecond
|
||||
margin = 2 * time.Second
|
||||
)
|
||||
|
||||
var logs bytes.Buffer
|
||||
|
||||
s := newStreamerWithFullStateQueue("")
|
||||
s.logger = &logger.Logger{Logger: slog.New(slog.NewJSONHandler(&logs,
|
||||
&slog.HandlerOptions{Level: slog.LevelError}))}
|
||||
s.handlers[0].heldState = []*ristypes.RISMessage{
|
||||
{Type: ristypes.MessageTypeState},
|
||||
}
|
||||
wantNotHandedOver := 1 + len(s.handlers[0].queue)
|
||||
// Stop cancels the stream Start would have started; there is none here.
|
||||
s.cancel = func() {}
|
||||
|
||||
release := make(chan struct{})
|
||||
defer close(release)
|
||||
|
||||
s.workers.Go(func() { <-release })
|
||||
|
||||
ctx, cancel := context.WithTimeout(t.Context(), deadline)
|
||||
defer cancel()
|
||||
|
||||
stopped := make(chan struct{})
|
||||
|
||||
go func() {
|
||||
s.Stop(ctx)
|
||||
close(stopped)
|
||||
}()
|
||||
|
||||
select {
|
||||
case <-stopped:
|
||||
case <-time.After(deadline + margin):
|
||||
t.Fatalf("Stop did not return within %s of its deadline", margin)
|
||||
}
|
||||
|
||||
var logged struct {
|
||||
Messages int `json:"messages"`
|
||||
}
|
||||
|
||||
err := json.Unmarshal(logs.Bytes(), &logged)
|
||||
if err != nil {
|
||||
t.Fatalf("want the error Stop logs, got %q: %v", logs.String(), err)
|
||||
}
|
||||
|
||||
if logged.Messages != wantNotHandedOver {
|
||||
t.Errorf("Stop logged %d messages not handed over, want %d",
|
||||
logged.Messages, wantNotHandedOver)
|
||||
}
|
||||
}
|
||||
|
||||
// TestStopBeforeMessageReachesQueues stops the streamer after the read loop
|
||||
// has checked for cancellation but before it hands the message to the handler
|
||||
// queues. That is the gap a stop from another goroutine can land in, and it
|
||||
@@ -429,7 +494,7 @@ func TestStopBeforeMessageReachesQueues(t *testing.T) {
|
||||
s := New(logger.New(), metrics.New())
|
||||
s.url = srv.URL
|
||||
s.RegisterHandler(updateHandler{})
|
||||
s.RegisterRawHandler(func(string) { s.Stop() })
|
||||
s.RegisterRawHandler(func(string) { s.Stop(t.Context()) })
|
||||
|
||||
// Start would run the stream in the background, where the test cannot
|
||||
// wait for it. Setting cancel as Start does lets Stop cancel the stream
|
||||
@@ -443,7 +508,7 @@ func TestStopBeforeMessageReachesQueues(t *testing.T) {
|
||||
}
|
||||
|
||||
// A second Stop must not close the queues again.
|
||||
s.Stop()
|
||||
s.Stop(t.Context())
|
||||
}
|
||||
|
||||
// TestReconnectWhenStreamEnds has the server end the first response
|
||||
@@ -676,7 +741,7 @@ func checkReconnect(
|
||||
if err != nil {
|
||||
t.Fatalf("Start returned error: %v", err)
|
||||
}
|
||||
defer s.Stop()
|
||||
defer s.Stop(t.Context())
|
||||
|
||||
select {
|
||||
case <-handler.handled:
|
||||
|
||||
Reference in New Issue
Block a user