Merge branch 'main' into bq-single-statement-merge

dev-peerdb.sh

@@ -1,12 +1,27 @@
-#!/bin/bash
-set -Eeuo pipefail
+#!/bin/sh
+if test -z "$USE_PODMAN"
+then
+    if ! command -v docker &> /dev/null
+    then
+        if command -v podman-compose
+        then
+            echo "docker could not be found on PATH, using podman-compose"
+            USE_PODMAN=1
+        else
+            echo "docker could not be found on PATH"
+            exit 1
+        fi
+    fi
+fi
 
-if ! command -v docker &> /dev/null
+if test -z "$USE_PODMAN"
 then
-    echo "docker could not be found on PATH"
-    exit 1
+    DOCKER="docker compose"
+    EXTRA_ARGS="--no-attach temporal --no-attach pyroscope --no-attach temporal-ui"
+else
+    DOCKER="podman-compose --podman-run-args=--replace"
+    EXTRA_ARGS=""
 fi
 
 export PEERDB_VERSION_SHA_SHORT=local-$(git rev-parse --short HEAD)
-docker compose -f docker-compose-dev.yml up --build \
- --no-attach temporal --no-attach pyroscope --no-attach temporal-ui
+exec $DOCKER -f docker-compose-dev.yml up --build $EXTRA_ARGS

docker-compose-dev.yml

@@ -44,7 +44,7 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-d", "postgres", "-U", "postgres"]
+      test: ["CMD", "pg_isready", "-d", "postgres", "-U", "postgres"]
       interval: 10s
       timeout: 30s
       retries: 5

docker-compose.yml

@@ -37,7 +37,7 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-d", "postgres", "-U", "postgres"]
+      test: ["CMD", "pg_isready", "-d", "postgres", "-U", "postgres"]
       interval: 10s
       timeout: 30s
       retries: 5

flow/activities/slot.go

@@ -23,6 +23,11 @@ func (a *FlowableActivity) handleSlotInfo(
 		return err
 	}
 
+	if slotInfo == nil || len(slotInfo) == 0 {
+		slog.WarnContext(ctx, "warning: unable to get slot info", slog.Any("slotName", slotName))
+		return nil
+	}
+
 	deploymentUIDPrefix := ""
 	if peerdbenv.PeerDBDeploymentUID() != "" {
 		deploymentUIDPrefix = fmt.Sprintf("[%s] ", peerdbenv.PeerDBDeploymentUID())