Update test

Signed-off-by: mdouglas47 <[email protected]>

Author: morgando

tests/sc_resume_partition.test/lrl.options

@@ -1,2 +1,3 @@
 multitable_ddl 1
 partitioned_table_merge_resume on
+test_sc_resume_race 1

tests/sc_resume_partition.test/mdouglas47db.failexit

@@ -0,0 +1 @@
+Failed kill_by_pidfile: pidfile /mdouglas47db.m4.pid does not exist

tests/sc_resume_partition.test/runit

@@ -28,33 +28,39 @@ teardown() {
 	cdb2sql ${CDB2_OPTIONS} ${dbnm} ${tier} "drop table ${tbl_name}"
 }
 
-# Tests that the resume of partitioned table merge triggered by a crash or a downgrade completes correctly
-test_driver() {
-	local -r tbl_name=$1 num_shards=$2 num_records_per_shard=$3 resume_trigger=$4
+do_resume() {
+	local -r tbl_name=$1 num_shards=$2 num_records_inserted_per_shard_during_resume=$3 resume_trigger=$4
 	local master
 	master=`cdb2sql --tabs ${CDB2_OPTIONS} $dbnm ${tier} 'SELECT host FROM comdb2_cluster WHERE is_master="Y"'`
 
 	COMDB2_CONFIG_MIN_RETRIES=0 \
 	COMDB2_CONFIG_MAX_RETRIES=0 \
 	cdb2sql ${CDB2_OPTIONS} ${dbnm} ${tier} "alter table ${tbl_name} partitioned by none" &
 	local -r waitpid=$!
-	sleep 5
+	sleep 2
 
 	#cdb2sql ${CDB2_OPTIONS} ${dbnm} ${tier} "rebuild ${tbl_name}" &
 
-	trigger_resume ${master} ${resume_trigger}
+#	trigger_resume ${master} ${resume_trigger}
+	echo "TRIGGER RESUME NOW"
+	sleep 20
 
 	if wait ${waitpid};
 	then
 		echo "FAIL: Merge succeeded before master swing. Test is buggy."
 		return 1
 	fi
 
-	local -r num_records_inserted_per_shard_during_resume=1
 	insert_records_into_table ${tbl_name} ${num_shards} ${num_records_inserted_per_shard_during_resume}
 
 	wait_for_outstanding_scs &> /dev/null
 
+}
+
+# Verifies that resume completed correctly
+verify() {
+	local -r tbl_name=$1 num_shards=$2 num_records_per_shard=$3 num_records_inserted_per_shard_during_resume=$4
+
 	local timepart
 	timepart=$(cdb2sql --tabs ${CDB2_OPTIONS} ${dbnm} ${tier} "select * from comdb2_timepartitions where name='${tbl_name}'")
 	if [[ -n ${timepart} ]];
@@ -63,7 +69,7 @@ test_driver() {
 		return 1
 	fi
 
-	local -r expected_num_records=$(num_shards*num_records_per_shard+num_shards*num_records_inserted_per_shard_during_resume)
+	local -r expected_num_records=$((num_shards*num_records_per_shard+num_shards*num_records_inserted_per_shard_during_resume))
 	local actual_num_records
 	actual_num_records=$(cdb2sql --tabs ${CDB2_OPTIONS} ${dbnm} ${tier} "select count(*) from ${tbl_name}")
 	if (( actual_num_records != expected_num_records ));
@@ -75,23 +81,19 @@ test_driver() {
 
 run_test() {
 	local -r num_shards=$1 num_records_per_shard=$2 resume_trigger=$3 op_for_creating_partition=$4
-	local -r tbl_name="t"
+	local -r tbl_name="t" num_records_per_shard_inserted_during_resume=1
 
 	setup ${tbl_name} ${num_shards} ${num_records_per_shard} ${op_for_creating_partition}
-
-	test_driver ${tbl_name} ${num_shards} ${num_records_per_shard} ${resume_trigger}
-	local -r rc=$?
-	
+	do_resume ${tbl_name} ${num_shards} ${num_records_per_shard_inserted_during_resume} ${resume_trigger}
+	verify ${tbl_name} ${num_shards} ${num_records_per_shard} ${num_records_per_shard_inserted_during_resume}
 	teardown ${tbl_name}
-
-	return ${rc}
 }
 
 main() {
 	local -r num_shards=5
 	for num_records_per_shard in 10000;
 	do
-		for resume_trigger in ${DOWNGRADE};
+		for resume_trigger in ${CRASH};
 		do
 			for op_for_creating_partition in ${CREATE};
 			do

tests/sc_resume_partition.test/util.sh

@@ -42,6 +42,8 @@ wait_for_outstanding_scs() {
 }
 
 create_table() {
+	local -r tbl_name=$1
+
 	local starttime
 	starttime=$(get_timestamp 120)
 	#cdb2sql ${CDB2_OPTIONS} ${dbnm} ${tier} "create table ${tbl_name}(i int, j int)"
@@ -56,7 +58,7 @@ create_table() {
 }
 
 insert_records_into_table() {
-	local -r tbl_name=$1 num_shards=$2 num_records_per_shard=$3 op_for_creating_partitioned_table=$4
+	local -r tbl_name=$1 num_shards=$2 num_records_per_shard=$3
 	for i in $(seq 0 1 $((num_shards-1)));
 	do
 		local shard
@@ -77,7 +79,7 @@ trigger_resume() {
 	elif (( resume_trigger == DOWNGRADE )); then
 		downgrade ${master}
 	else
-		echo "FAIL: expected resume_trigger to be one of: KILL, DOWNGRADE"
+		echo "FAIL: expected resume_trigger to be one of: CRASH, DOWNGRADE"
 		return 1
 	fi
 }