2

Author: danolivo

.github/workflows/spockbench.yml

@@ -59,7 +59,7 @@ jobs:
           cd ${GITHUB_WORKSPACE}/tests/docker/
           echo PG_VER=${{ matrix.pgver }} >> pgedge.env
           env BASE_IMAGE=ghcr.io/pgedge/base-test-image:latest \
-            docker compose up --wait -d
+            docker compose up --build --wait -d
         timeout-minutes: 20
 
       - name: Run tests on all nodes

tests/docker/entrypoint.sh

@@ -63,14 +63,15 @@ track_commit_timestamp = 'on'
 max_worker_processes = 32
 max_replication_slots = 32
 max_wal_senders = 32
-log_min_messages = debug5
+log_min_messages = log
 
 # Network configuration for multi-node cluster
 listen_addresses = '*'
 
 # Spock Configuration
 shared_preload_libraries = 'spock'
 spock.conflict_resolution = 'last_update_wins'
+spock.save_resolutions = 'on'
 EOF
 
 	# Configure client authentication for Docker network

tests/docker/run-tests.sh

@@ -90,8 +90,13 @@ _EOF_
   SELECT spock.wait_slot_confirm_lsn(NULL, NULL);
 _EOF_
 
-  echo "Waiting for apply worker timeouts..."
-  sleep 5
+  # To be sure that conflict resolution has happened we need to wait until the
+  # following transaction arrives
+  lsn1=$(psql -A -t -h /tmp -c "SELECT spock.sync_event()")
+  echo "Wait until XLogRecord $lsn1 arrive and applies from $HOSTNAME to ${peer_names[0]}"
+  psql -A -t -h ${peer_names[0]} -c \
+    "CALL spock.wait_for_sync_event(true, '$HOSTNAME', '$lsn1'::pg_lsn, 30)"
+
   echo "Checking the exception table now..."
   elog_entries=$(psql -A -t -h ${peer_names[0]} -c "
   	SELECT count(*)