3

Author: danolivo

.github/workflows/spockbench.yml

@@ -50,6 +50,7 @@ jobs:
       - name: Build docker container
         run: |
           cd ${GITHUB_WORKSPACE}/
+          # Build docker image once for specific version, needed for this test
           docker build \
             --build-arg PGVER=${{ matrix.pgver }} \
             -t spock -f tests/docker/Dockerfile-step-1.el9 .
@@ -58,16 +59,14 @@ jobs:
         run: |
           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 --build --wait -d
+          docker compose up --wait -d
         timeout-minutes: 20
 
       - name: Run tests on all nodes
         run: |
           cd ${GITHUB_WORKSPACE}/tests/docker/
 
           # Launch tests in background with per-node timeout and capture PIDs
-          # Each node gets 5 minutes max (more than RUNTIME=60s + overhead)
           docker compose exec -T pgedge-n1 bash -c "~/tests/run-tests.sh" &
           PID1=$!
           docker compose exec -T pgedge-n2 bash -c "~/tests/run-tests.sh" &
@@ -98,10 +97,11 @@ jobs:
           cd ${GITHUB_WORKSPACE}/tests/docker/
           mkdir -p node-logs
 
-          # Collect PostgreSQL logs from each node
+          # Collect PostgreSQL logs and spockbench output from each node
           for node in n1 n2 n3; do
             echo "Collecting logs from $node..."
             docker compose cp pgedge-$node:/home/pgedge/pgedge/data/pg${{ matrix.pgver }}/log node-logs/$node-pg-log/ || true
+            docker compose cp pgedge-$node:/home/pgedge/spock/spockbench-$node.out node-logs/ || true
             docker compose logs pgedge-$node > node-logs/$node-container.log 2>&1 || true
           done
 
@@ -120,13 +120,14 @@ jobs:
           cd ${GITHUB_WORKSPACE}/tests/docker
           ./check-outputs.sh || true
 
-      - name: Cleanup docker
+      - name: Cleanup spockbench docker container
         if: ${{ always() }}
         run: |
           cd ${GITHUB_WORKSPACE}/tests/docker/
           docker compose down || true
 
       - name: Run regression tests
+        if: ${{ always() }}
         run: |
           REG_CT_NAME="spock-regress-${{ matrix.pgver }}-${{ github.run_id }}-${{ github.run_attempt }}"
           echo "REG_CT_NAME=$REG_CT_NAME" >> "$GITHUB_ENV"
@@ -150,6 +151,7 @@ jobs:
           retention-days: 7
 
       - name: Run TAP tests
+        if: ${{ always() }}
         run: |
           TAP_CT_NAME="spock-tap-${{ matrix.pgver }}-${{ github.run_id }}-${{ github.run_attempt }}"
           echo "TAP_CT_NAME=$TAP_CT_NAME" >> "$GITHUB_ENV"

src/spock_relcache.c

@@ -156,6 +156,7 @@ spock_relation_open(uint32 remoteid, LOCKMODE lockmode)
 			 * value of the relreplident field. But it is just a cache ...
 			 */
 			relinfo->ri_RelationDesc->rd_rel->relreplident = REPLICA_IDENTITY_DEFAULT;
+			relinfo->ri_RelationDesc->rd_indexvalid = false;
 			entry->idxoid = RelationGetReplicaIndex(relinfo->ri_RelationDesc);
 			Assert(entry->idxoid != InvalidOid);
 			relinfo->ri_RelationDesc->rd_rel->relreplident = REPLICA_IDENTITY_FULL;

tests/docker/run-spock-regress.sh

@@ -3,10 +3,7 @@
 ### Run the regression tests
 ###
 
-
-export PG_CONFIG=/home/pgedge/pgedge/pg${PGVER}/bin/pg_config
-export PATH=/home/pgedge/pgedge/pg${PGVER}/bin:$PATH
-export LD_LIBRARY_PATH=/home/pgedge/pgedge/pg${PGVER}/lib/:$LD_LIBRARY_PATH
+source "${HOME}/.bashrc"
 
 # PGVER should be previously set in the environment
 if [ -z "${PGVER}" ]

tests/docker/run-spock-tap.sh

@@ -3,10 +3,7 @@
 ### Run selected TAP tests iteratively
 ###
 
-
-export PG_CONFIG=/home/pgedge/pgedge/pg${PGVER}/bin/pg_config
-export PATH=/home/pgedge/pgedge/pg${PGVER}/bin:$PATH
-export LD_LIBRARY_PATH=/home/pgedge/pgedge/pg${PGVER}/lib/:$LD_LIBRARY_PATH
+source "${HOME}/.bashrc"
 
 # PGVER should be previously set in the environment
 if [ -z "${PGVER}" ]

tests/docker/run-tests.sh

@@ -137,27 +137,19 @@ fi
 spockbench -h /tmp -i -s $SCALEFACTOR $PGDATABASE
 
 psql -h /tmp <<_EOF_
-  -- SET spock.enable_ddl_replication = 'on';
-  -- SET spock.include_ddl_repset = 'on';
-
   /*
    * To use delta_apply we should add NOT NULL constraint on such a column first.
    * Do it on each node - remember, we don't have Auto-DDL enabled.
    */
---  ALTER TABLE pgbench_accounts ALTER COLUMN abalance SET NOT NULL;
---  ALTER TABLE pgbench_branches ALTER COLUMN bbalance SET NOT NULL;
---  ALTER TABLE pgbench_tellers ALTER COLUMN tbalance SET NOT NULL;
+  ALTER TABLE pgbench_accounts ALTER COLUMN abalance SET NOT NULL;
+  ALTER TABLE pgbench_branches ALTER COLUMN bbalance SET NOT NULL;
+  ALTER TABLE pgbench_tellers ALTER COLUMN tbalance SET NOT NULL;
 
   /*
    * Each node adds test tables to replication sets. Hence, further DML will be
    * propagated by LR to other nodes
    */
   SELECT spock.repset_add_all_tables('default', '{public}');
-
-
---  SELECT spock.delta_apply('pgbench_accounts', 'abalance', false);
---  SELECT spock.delta_apply('pgbench_branches', 'bbalance', false);
---  SELECT spock.delta_apply('pgbench_tellers', 'tbalance', false);
 _EOF_
 
 # ==========Spockbench tests ==========
@@ -168,6 +160,21 @@ spockbench -h /tmp --spock-num-nodes=3 --spock-node=${HOSTNAME:0-1} \
 	-s $SCALEFACTOR -T $RUNTIME -R $RATE -P 5 -j $THREADS -c $CONNECTIONS \
 	-n --spock-tx-mix=550,225,225 $PGDATABASE
 
+# To be sure each spockbench client finalised their job
+# There are still races possible. Should it be OK for our testing purposes?
+sleep 5
+
+# To be sure that conflict resolution has happened we need to wait until the
+# following transaction arrives
+echo "Begin after-Spockbench sync"
+for peer in "${peer_names[@]}"; do
+  lsn=$(psql -A -t -h $peer -c "SELECT spock.sync_event()")
+  echo "Wait until XLogRecord $lsn arrives and applies from $peer to $HOSTNAME"
+  psql -A -t -h /tmp -c \
+  "CALL spock.wait_for_sync_event(true, '$peer', '$lsn'::pg_lsn, 30)"
+done
+echo "Finish after-Spockbench sync"
+
 spockbench-check $PGDATABASE > /home/pgedge/spock/spockbench-$HOSTNAME.out
 # Check only this node's output file, not all nodes
 grep -q "ERROR" /home/pgedge/spock/spockbench-$HOSTNAME.out && exit 1 || exit 0