Merge branch 'fix/retrieval-activity-timeout' into 'master'

fix: add timeout to retrieval activity endpoint to prevent hanging

Closes #686

See merge request postgres-ai/database-lab!1109

Author: agneum

engine/internal/retrieval/engine/postgres/logical/activity.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"strconv"
+	"time"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
@@ -21,6 +22,9 @@ import (
 const (
 	dleRetrieval = "dle_retrieval"
 
+	// connectTimeout defines the timeout for connecting to the database.
+	connectTimeout = 10 * time.Second
+
 	// queryFieldsNum defines the expected number of fields in the query result.
 	queryFieldsNum = 5
 
@@ -39,7 +43,14 @@ const (
 func dbSourceActivity(ctx context.Context, dbCfg Connection) ([]activity.PGEvent, error) {
 	connStr := db.ConnectionString(dbCfg.Host, strconv.Itoa(dbCfg.Port), dbCfg.Username, dbCfg.DBName, dbCfg.Password)
 
-	querier, err := pgx.Connect(ctx, connStr)
+	pgxCfg, err := pgx.ParseConfig(connStr)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse connection config: %w", err)
+	}
+
+	pgxCfg.ConnectTimeout = connectTimeout
+
+	querier, err := pgx.ConnectConfig(ctx, pgxCfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to DB: %w", err)
 	}

engine/internal/srv/routes.go

@@ -35,6 +35,9 @@ import (
 
 const (
 	logsSinceInterval = "5m"
+
+	// activityTimeout defines the timeout for retrieving activity data.
+	activityTimeout = 15 * time.Second
 )
 
 func (s *Server) getInstanceStatus(w http.ResponseWriter, r *http.Request) {
@@ -56,7 +59,10 @@ func (s *Server) retrievalState(w http.ResponseWriter, r *http.Request) {
 		retrieving.NextRefresh = models.NewLocalTime(spec.Next(time.Now()))
 	}
 
-	retrieving.Activity = s.jobActivity(context.Background())
+	activityCtx, cancel := context.WithTimeout(context.Background(), activityTimeout)
+	defer cancel()
+
+	retrieving.Activity = s.jobActivity(activityCtx)
 
 	if err := api.WriteJSON(w, http.StatusOK, retrieving); err != nil {
 		api.SendError(w, r, err)