Test that resume of partition merge is blocked

tests/TODO

@@ -83,5 +83,6 @@ rowlocks_blkseq.test
 sc_async_constraints.test
 sigstopcluster.test
 weighted_standing_queue.test -- failing in rhel8 + podman
+sc_resume_partition.test -- Pending PR #5073
 
 # vim: set sw=4 ts=4 et:

tests/sc_resume_partition.test/Makefile

@@ -0,0 +1,8 @@
+ifeq ($(TESTSROOTDIR),)
+  include ../testcase.mk
+else
+  include $(TESTSROOTDIR)/testcase.mk
+endif
+ifeq ($(TEST_TIMEOUT),)
+    export TEST_TIMEOUT=2m
+endif

tests/sc_resume_partition.test/runit

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+source ${TESTSROOTDIR}/tools/runit_common.sh
+source ${TESTSROOTDIR}/tools/cluster_utils.sh
+
+set -ex
+
+[ -z "${CLUSTER}" ] && { echo "Test requires a cluster"; exit 0; }
+
+dbnm=$1
+
+restart_cluster() {
+	set +e
+	for node in ${CLUSTER} ; do
+		kill_restart_node ${node} &
+	done
+	set -e
+
+	sleep 2
+
+	wait_for_cluster
+}
+
+test_partition_merge_resume() {
+	# Given
+	local starttime
+	starttime=$(get_timestamp 120)
+	local master
+	master=`cdb2sql --tabs ${CDB2_OPTIONS} $dbnm default 'SELECT host FROM comdb2_cluster WHERE is_master="Y"'`
+
+	cdb2sql $dbnm --host $master "EXEC PROCEDURE sys.cmd.send('convert_record_sleep 1')"
+	cdb2sql ${CDB2_OPTIONS} ${dbnm} default "create table t(a int) partitioned by time period 'daily' retention 2 start '${starttime}'"
+	cdb2sql ${CDB2_OPTIONS} $dbnm default "insert into t values (1)"
+
+	# When
+	cdb2sql ${CDB2_OPTIONS} ${dbnm} default "alter table t partitioned by none" &
+	waitpid=$!
+	sleep 1
+	restart_cluster &> /dev/null
+
+	# Then
+	if wait ${waitpid};
+	then
+		echo "FAIL: Merge succeeded before cluster bounced. Test is buggy."
+		return 1
+	fi
+
+	local timepart
+	timepart=$(cdb2sql --tabs ${CDB2_OPTIONS} ${dbnm} default "select * from comdb2_timepartitions where name='t'")
+	if [[ -z ${timepart} ]];
+	then
+		echo "FAIL: Could not find expected time partition"
+		return 1
+	fi
+
+	# Cleanup
+	cdb2sql ${CDB2_OPTIONS} ${dbnm} default "drop table t"
+}
+
+test_partition_merge_resume

tests/tools/cluster_utils.sh

@@ -246,4 +246,9 @@ function kill_restart_tertiary_node
     waitmach $node $TERTIARY_DBNAME
 }
 
-
+function wait_for_cluster
+{
+    for node in ${CLUSTER} ; do
+        waitmach ${node}
+    done
+}