Return proper name to the docker image.

Pu spockbench as a first test

Spockbench

1

f

healthcheck

2

3

Author: danolivo

.github/workflows/spockbench.yml

@@ -50,11 +50,84 @@ 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 .
 
+      - name: Start docker cluster
+        run: |
+          cd ${GITHUB_WORKSPACE}/tests/docker/
+          echo PG_VER=${{ matrix.pgver }} >> pgedge.env
+          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
+          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" &
+          PID2=$!
+          docker compose exec -T pgedge-n3 bash -c "~/tests/run-tests.sh" &
+          PID3=$!
+
+          # Wait for all jobs and capture their exit codes
+          wait $PID1
+          EXIT1=$?
+          wait $PID2
+          EXIT2=$?
+          wait $PID3
+          EXIT3=$?
+
+          # Fail if any node failed
+          if [ $EXIT1 -ne 0 ] || [ $EXIT2 -ne 0 ] || [ $EXIT3 -ne 0 ]; then
+            echo "ERROR: One or more nodes failed"
+            exit 1
+          fi
+
+          echo "All nodes completed successfully"
+        timeout-minutes: 10
+
+      - name: Collect node logs
+        if: ${{ always() }}
+        run: |
+          cd ${GITHUB_WORKSPACE}/tests/docker/
+          mkdir -p node-logs
+
+          # 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
+
+      - name: Upload node logs
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: spockbench-node-logs-${{ matrix.pgver }}
+          path: tests/docker/node-logs/
+          if-no-files-found: ignore
+          retention-days: 7
+
+      - name: Check spockbench output
+        if: ${{ always() }}
+        run: |
+          cd ${GITHUB_WORKSPACE}/tests/docker
+          ./check-outputs.sh || true
+
+      - 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"
@@ -78,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"
@@ -102,38 +176,3 @@ jobs:
             tests/logs/**
           if-no-files-found: ignore
           retention-days: 7
-
-      - name: Start docker cluster
-        run: |
-          cd ${GITHUB_WORKSPACE}/tests/docker/
-          echo PG_VER=${{ matrix.pgver }} >> pgedge.env
-          env BASE_IMAGE=ghcr.io/pgedge/base-debug-image:latest \
-            docker-compose up --wait -d --build
-        timeout-minutes: 20
-
-      - name: Run tests on all nodes
-        run: |
-          cd ${GITHUB_WORKSPACE}/tests/docker/
-          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" &
-          PID2=$!
-          docker-compose exec -T pgedge-n3 bash -c "~/tests/run-tests.sh" &
-          PID3=$!
-          wait $PID1
-          wait $PID2
-          wait $PID3
-        timeout-minutes: 30
-
-      - name: Check spockbench output
-        if: ${{ always() }}
-        run: |
-          cd ${GITHUB_WORKSPACE}/tests/docker
-          ./check-outputs.sh || true
-
-      - name: Cleanup docker
-        if: ${{ always() }}
-        run: |
-          cd ${GITHUB_WORKSPACE}/tests/docker/
-          docker-compose down || true
-

sql/spock--6.0.0-devel.sql

@@ -281,9 +281,18 @@ RETURNS oid CALLED ON NULL INPUT VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'spoc
 CREATE FUNCTION spock.repset_drop(set_name name, ifexists boolean DEFAULT false)
 RETURNS boolean STRICT VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'spock_drop_replication_set';
 
-CREATE FUNCTION spock.repset_add_table(set_name name, relation regclass, synchronize_data boolean DEFAULT false,
-	columns text[] DEFAULT NULL, row_filter text DEFAULT NULL, include_partitions boolean default true)
-RETURNS boolean CALLED ON NULL INPUT VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'spock_replication_set_add_table';
+CREATE FUNCTION spock.repset_add_table(
+  set_name           name,
+  relation           regclass,
+  synchronize_data   boolean DEFAULT false,
+  columns            text[] DEFAULT NULL,
+  row_filter         text DEFAULT NULL,
+  include_partitions boolean default true
+)
+RETURNS boolean
+AS 'MODULE_PATHNAME', 'spock_replication_set_add_table'
+LANGUAGE C CALLED ON NULL INPUT VOLATILE;
+
 CREATE FUNCTION spock.repset_add_all_tables(set_name name, schema_names text[], synchronize_data boolean DEFAULT false)
 RETURNS boolean STRICT VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'spock_replication_set_add_all_tables';
 CREATE FUNCTION spock.repset_remove_table(set_name name, relation regclass, include_partitions boolean default true)
@@ -652,9 +661,9 @@ $$ LANGUAGE plpgsql;
 
 -- Set delta_apply security label on specific column
 CREATE FUNCTION spock.delta_apply(
-  rel regclass,
+  rel      regclass,
   att_name name,
-  to_drop boolean DEFAULT false
+  to_drop  boolean DEFAULT false
 ) RETURNS boolean AS $$
 DECLARE
   label     text;

src/spock_apply_heap.c

@@ -928,8 +928,7 @@ spock_apply_heap_insert(SpockRelation *rel, SpockTupleData *newtup)
 									remoteslot, &localslot,
 									true);
 
-	if (check_all_uc_indexes &&
-		!found)
+	if (check_all_uc_indexes && !found)
 	{
 		/*
 		 * Handle the special case of looking through all unique indexes

src/spock_conflict.c

@@ -348,7 +348,6 @@ spock_report_conflict(ConflictType conflict_type,
 	const char *idxname = "(unknown)";
 	const char *qualrelname;
 
-
 	/* Ignore update-update conflict for same origin */
 	if (conflict_type == CT_UPDATE_EXISTS)
 	{

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/Dockerfile-base.md

@@ -35,27 +35,33 @@ The image includes **all** libraries required to build PostgreSQL with maximum f
 
 | Library | Purpose | Configure Flag |
 |---------|---------|----------------|
-| `zstd-devel` | Zstandard compression | `--with-zstd` |
+| `libzstd-devel` | Zstandard compression | `--with-zstd` |
 | `lz4-devel` | LZ4 compression | `--with-lz4` |
 | `libicu-devel` | Unicode and internationalization | `--with-icu` |
 | `libxml2-devel` | XML support | `--with-libxml` |
 | `libxslt-devel` | XSLT transformations | `--with-libxslt` |
 | `openssl-devel` | SSL/TLS connections | `--with-openssl` |
 | `krb5-devel` | Kerberos authentication | `--with-gssapi` |
+| `cyrus-sasl-gssapi` | SASL GSSAPI support | Related to GSSAPI |
 | `openldap-devel` | LDAP authentication | `--with-ldap` |
 | `pam-devel` | PAM authentication | `--with-pam` |
 | `systemd-devel` | Systemd integration | `--with-systemd` |
 | `python3-devel` | PL/Python language | `--with-python` |
 | `readline-devel` | Enhanced psql CLI | Built-in |
 | `llvm-devel` | JIT compilation | `--with-llvm` |
-| `libuuid-devel` | UUID generation | `--with-uuid=ossp` |
+| `libuuid-devel`, `uuid-devel` | UUID generation | `--with-uuid=ossp` |
+| `libpq`, `libpq-devel` | PostgreSQL client library | Development headers |
+| `jansson-devel` | JSON parsing | For extensions |
+| `zlib-devel` | Compression library | Built-in |
+| `pkgconfig` | Package config tool | Build system helper |
 
 ### 3. Testing Infrastructure
 
-- **Perl Testing Framework**: `perl-IPC-Run`, `Test::More` for PostgreSQL TAP tests
-- **SSH Configuration**: Pre-configured SSH keys for multi-node testing scenarios
+- **Perl Testing Framework**: `perl-IPC-Run`, `perl-Test-Simple` (includes Test::More) for PostgreSQL TAP tests
+- **SSH Configuration**: Pre-configured SSH keys and `openssh-clients`, `openssh-server` for multi-node testing scenarios
 - **Network Tools**: `nc` (netcat), `bind-utils` (dig, nslookup) for connectivity testing
 - **Process Tools**: `procps` for monitoring and debugging
+- **Utility Tools**: `curl`, `unzip` for downloading and extracting archives
 
 ### 4. User Configuration
 
@@ -77,10 +83,7 @@ The image includes **all** libraries required to build PostgreSQL with maximum f
 1. **System Packages** (~500MB compressed):
    - Rocky Linux 9 base system updates
    - Development Tools group install
-   - 40+ development packages and their dependencies
-
-2. **Perl Modules** (via CPAN):
-   - `Test::More` - PostgreSQL TAP test framework
+   - 40+ development packages and their dependencies (all installed via dnf)
 
 ## Image Size and Optimization
 
@@ -96,7 +99,6 @@ This large size is **intentional and appropriate** for a development/testing bas
 ```dockerfile
 dnf clean all
 rm -rf /var/cache/dnf/* /tmp/* /var/tmp/*
-rm -rf /root/.cpanm
 ```
 
 ## Usage Examples

tests/docker/Dockerfile-step-1.el9

@@ -37,7 +37,7 @@
 #	further details.
 # ==============================================================================
 
-ARG BASE_IMAGE=base-test-image:latest
+ARG BASE_IMAGE=ghcr.io/pgedge/base-test-image:latest
 FROM ${BASE_IMAGE}
 
 # ==============================================================================
@@ -92,6 +92,22 @@ RUN set -eux && \
 COPY . /home/pgedge/spock
 COPY --chmod=755 tests/docker/*.sh /home/pgedge/
 
+# ==============================================================================
+# Clone & Install Spockbench Testing Framework (needs root privileges)
+# ==============================================================================
+
+# Clone spockbench for testing workloads
+# TODO: Pin to specific tag/commit for reproducibility
+RUN set -eux && \
+    git clone --branch delta-apply-update --depth 1 \
+        https://github.com/pgEdge/spockbench.git /home/pgedge/spockbench && \
+	echo "export SPOCKBENCH_SOURCE_DIR=/home/pgedge/spockbench" >> /home/pgedge/.bashrc
+
+RUN set -eux && \
+    cd /home/pgedge/spockbench && \
+    python3 setup.py install && \
+    echo "Spockbench installation complete"
+
 # Set proper ownership
 RUN chown -R pgedge:pgedge /home/pgedge/
 
@@ -119,17 +135,6 @@ RUN set -eux && \
     git clone --branch "${LATEST_TAG}" --depth 1 \
         https://github.com/postgres/postgres.git /home/pgedge/postgres
 
-# ==============================================================================
-# Clone Spockbench Testing Framework
-# ==============================================================================
-
-# Clone spockbench for testing workloads
-# TODO: Pin to specific tag/commit for reproducibility
-RUN set -eux && \
-    git clone --branch delta-apply-update --depth 1 \
-        https://github.com/pgEdge/spockbench.git /home/pgedge/spockbench && \
-	echo "export SPOCKBENCH_SOURCE_DIR=/home/pgedge/spockbench" >> /home/pgedge/.bashrc
-
 # ==============================================================================
 # Apply Spock Patches to PostgreSQL
 # ==============================================================================
@@ -183,13 +188,13 @@ RUN set -eux && \
     echo "========================================" && \
     echo "Building PostgreSQL (${MAKE_JOBS} jobs)" && \
     echo "========================================" && \
-    make -j${MAKE_JOBS} && \
-    make -C contrib -j${MAKE_JOBS} && \
+    make -j${MAKE_JOBS} > /dev/null && \
+    make -C contrib -j${MAKE_JOBS} > /dev/null && \
     echo "========================================" && \
     echo "Installing PostgreSQL" && \
     echo "========================================" && \
-    make install && \
-    make -C contrib install && \
+    make install > /dev/null && \
+    make -C contrib install > /dev/null && \
     echo "PostgreSQL installation complete"
 
 # ==============================================================================
@@ -202,21 +207,12 @@ RUN set -eux && \
     echo "========================================" && \
     echo "Building Spock Extension" && \
     echo "========================================" && \
-    make clean && \
-    make -j${MAKE_JOBS} && \
-    make install && \
+    make clean > /dev/null && \
+    make -j${MAKE_JOBS} > /dev/null && \
+    make install > /dev/null && \
 	echo "export SPOCK_SOURCE_DIR=/home/pgedge/spock" >> /home/pgedge/.bashrc && \
     echo "Spock installation complete"
 
-# ==============================================================================
-# Install spockbench
-# ==============================================================================
-
-RUN set -eux && \
-    cd /home/pgedge/spockbench && \
-    sudo python3 setup.py install && \
-    echo "Spockbench installation complete"
-
 # ==============================================================================
 # Runtime Configuration
 # ==============================================================================

tests/docker/docker-compose.yml

@@ -31,7 +31,7 @@ services:
       - ./cores/n1:/cores
       - .:/home/pgedge/tests
     healthcheck:
-      test: ["CMD", "pg_isready", "-h", "/tmp", "-U", "admin"]
+      test: ["CMD-SHELL", "pg_isready -h /tmp -p $$DBPORT -U $$DBUSER -d $$DBNAME && test -f /tmp/spock_init_complete"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -72,7 +72,7 @@ services:
       - ./cores/n2:/cores
       - .:/home/pgedge/tests
     healthcheck:
-      test: ["CMD", "pg_isready", "-h", "/tmp", "-U", "admin"]
+      test: ["CMD-SHELL", "pg_isready -h /tmp -p $$DBPORT -U $$DBUSER -d $$DBNAME && test -f /tmp/spock_init_complete"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -113,7 +113,7 @@ services:
       - ./cores/n3:/cores
       - .:/home/pgedge/tests
     healthcheck:
-      test: ["CMD", "pg_isready", "-h", "/tmp", "-U", "admin"]
+      test: ["CMD-SHELL", "pg_isready -h /tmp -p $$DBPORT -U $$DBUSER -d $$DBNAME && test -f /tmp/spock_init_complete"]
       interval: 10s
       timeout: 5s
       retries: 5