Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/physrep_ignore_table.test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ else
include $(TESTSROOTDIR)/testcase.mk
endif
ifeq ($(TEST_TIMEOUT),)
export TEST_TIMEOUT=10m
export TEST_TIMEOUT=15m
endif

12 changes: 3 additions & 9 deletions tests/physrep_ignore_table.test/runit
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
#!/usr/bin/env bash

#set -x

source ${TESTSROOTDIR}/tools/runit_common.sh

export COPYCOMDB2_EXE=${BUILDDIR}/db/copycomdb2
export DESTDB=${TESTCASE}dest${TESTID}
export DEST_DBDIR=${DBDIR}/$DESTDB
export stopfile=./stopfile.txt

if [[ -z "$TEST_TIMEOUT" ]] ; then
export TEST_TIMEOUT=5m
fi
set -x

function failexit
{
Expand Down Expand Up @@ -147,8 +143,6 @@ function check_physrep_file_sizes

function verify_ignored_tables
{
# Give physreps 100 seconds to catch up

t1=$(${CDB2SQL_EXE} -s --tabs ${CDB2_OPTIONS} $DBNAME default "select count(*) from t1" 2>&1)
t3=$(${CDB2SQL_EXE} -s --tabs ${CDB2_OPTIONS} $DBNAME default "select count(*) from t3" 2>&1)

Expand All @@ -157,7 +151,7 @@ function verify_ignored_tables

# Physrep t1 & t3 should match parent
j=0
while [[ "$j" -lt 101 ]] && [[ "$t1" != "$t1p" || "$t3" != "$t3p" ]] ; do
while [[ "$t1" != "$t1p" || "$t3" != "$t3p" ]] ; do
sleep 1

t1=$(${CDB2SQL_EXE} -s --tabs ${CDB2_OPTIONS} $DBNAME default "select count(*) from t1" 2>&1)
Expand All @@ -166,8 +160,8 @@ function verify_ignored_tables
t1p=$(${CDB2SQL_EXE} -s --tabs ${CDB2_OPTIONS} $DESTDB @localhost "select count(*) from t1" 2>&1)
t3p=$(${CDB2SQL_EXE} -s --tabs ${CDB2_OPTIONS} $DESTDB @localhost "select count(*) from t3" 2>&1)

let j=j+1
done

[[ "$t1" != "$t1p" ]] && failexit "t1 has different size on physrep: cluster=$t1 vs physrep=$t1p"
[[ "$t3" != "$t3p" ]] && failexit "t3 has different size on physrep: cluster=$t3 vs physrep=$t3p"

Expand Down
Loading