Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
fix(private-location): discard idle remote libSQL connections (#2920)
Domen Kožar3c708cedc1dc
diff --git a/apps/private-location/internal/database/database.go b/apps/private-location/internal/database/database.goindex eed40a42b..282a827b2 100644--- a/apps/private-location/internal/database/database.go+++ b/apps/private-location/internal/database/database.go@@ -15,9 +15,10 @@ import (const (// Bound the pool so bursts of concurrent ingests can't open an unbounded// number of remote libSQL connections (see #2861).- maxOpenConns = 16- maxIdleConns = 16- connMaxIdleTime = time.Minute+ maxOpenConns = 16++ maxLocalIdleConns = 16+ localConnMaxIdleTime = time.Minute)var (@@ -46,11 +47,11 @@ func New() *sqlx.DB {// Open opens a libSQL database with a bounded connection pool.// dsn can be a remote URL (libsql://, http://, https://) or a local file: URL.func Open(dsn string, token string) (*sqlx.DB, error) {+ u, err := url.Parse(dsn)+ if err != nil {+ return nil, err+ }if token != "" {- u, err := url.Parse(dsn)- if err != nil {- return nil, err- }q := u.Query()q.Set("authToken", token)u.RawQuery = q.Encode()@@ -61,9 +62,15 @@ func Open(dsn string, token string) (*sqlx.DB, error) {if err != nil {return nil, err}+ idleConns := maxLocalIdleConns+ switch u.Scheme {+ case "http", "https", "libsql":+ // Remote Hrana streams can expire before the pool's idle timeout.+ idleConns = 0+ }c.SetMaxOpenConns(maxOpenConns)- c.SetMaxIdleConns(maxIdleConns)- c.SetConnMaxIdleTime(connMaxIdleTime)+ c.SetMaxIdleConns(idleConns)+ c.SetConnMaxIdleTime(localConnMaxIdleTime)return sqlx.NewDb(c, "sqlite3"), nil}diff --git a/apps/private-location/internal/database/database_test.go b/apps/private-location/internal/database/database_test.gonew file mode 100644index 000000000..b2deca705--- /dev/null+++ b/apps/private-location/internal/database/database_test.go@@ -0,0 +1,109 @@+package database++import (+ "encoding/json"+ "fmt"+ "net/http"+ "net/http/httptest"+ "path/filepath"+ "sync"+ "testing"+)++func TestOpenRemoteDoesNotReuseExpiredStreams(t *testing.T) {+ var mu sync.Mutex+ streams := map[string]bool{}+ nextStream := 0+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {+ var request struct {+ Baton *string `json:"baton"`+ Requests []struct {+ Type string `json:"type"`+ } `json:"requests"`+ Batch json.RawMessage `json:"batch"`+ }+ if err := json.NewDecoder(r.Body).Decode(&request); err != nil {+ http.Error(w, err.Error(), http.StatusBadRequest)+ return+ }+ mu.Lock()+ defer mu.Unlock()+ w.Header().Set("Content-Type", "application/json")+ var baton string+ if request.Baton == nil {+ nextStream+++ baton = fmt.Sprintf("stream-%d", nextStream)+ streams[baton] = false+ } else {+ baton = *request.Baton+ if streams[baton] {+ w.WriteHeader(http.StatusBadRequest)+ fmt.Fprint(w, `{"message":"The stream has expired due to inactivity","code":"STREAM_EXPIRED"}`)+ return+ }+ }+ if len(request.Batch) > 0 {+ fmt.Fprintf(w, "{\"baton\":%q,\"base_url\":null}\n", baton)+ fmt.Fprintln(w, `{"type":"step_begin","step":0,"cols":[{"name":"1","decltype":null}]}`)+ fmt.Fprintln(w, `{"type":"row","row":[{"type":"integer","value":"1"}]}`)+ fmt.Fprintln(w, `{"type":"step_end","affected_row_count":0,"last_insert_rowid":null}`)+ fmt.Fprintln(w, `{"type":"replication_index","replication_index":null}`)+ return+ }+ if len(request.Requests) == 1 && request.Requests[0].Type == "describe" {+ fmt.Fprintf(w, `{"baton":%q,"base_url":null,"results":[{"type":"ok","response":{"type":"describe","result":{"params":[],"cols":[{"name":"1","decltype":null}],"is_explain":false,"is_readonly":true}}}]}`, baton)+ return+ }+ if len(request.Requests) == 1 && request.Requests[0].Type == "close" {+ fmt.Fprint(w, `{"baton":null,"base_url":null,"results":[{"type":"ok","response":{"type":"close"}}]}`)+ return+ }+ http.Error(w, "unexpected Hrana request", http.StatusBadRequest)+ }))+ defer server.Close()++ db, err := Open(server.URL, "")+ if err != nil {+ t.Fatal(err)+ }+ defer db.Close()+ var value int+ if err := db.Get(&value, "SELECT 1"); err != nil {+ t.Fatal(err)+ }+ if value != 1 {+ t.Fatalf("first query returned %d, want 1", value)+ }++ // Expire existing streams without a wall-clock delay.+ mu.Lock()+ for baton := range streams {+ streams[baton] = true+ }+ mu.Unlock()++ if err := db.Get(&value, "SELECT 1"); err != nil {+ t.Fatalf("query after stream expiry: %v", err)+ }+ if value != 1 {+ t.Fatalf("second query returned %d, want 1", value)+ }+ if got := db.Stats().MaxOpenConnections; got != maxOpenConns {+ t.Fatalf("max open connections = %d, want %d", got, maxOpenConns)+ }+}++func TestOpenLocalRetainsIdleConnections(t *testing.T) {+ db, err := Open("file:"+filepath.Join(t.TempDir(), "pool.db"), "")+ if err != nil {+ t.Fatal(err)+ }+ defer db.Close()+ var value int+ if err := db.Get(&value, "SELECT 1"); err != nil {+ t.Fatal(err)+ }+ if db.Stats().Idle == 0 {+ t.Fatal("local database should retain an idle connection")+ }+}