summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgon Valdmees2011-06-07 12:49:00 +0000
committerEgon Valdmees2011-06-08 14:11:12 +0000
commita4b16560c24936c11529db5be84e2286cf7e1c2a (patch)
treecb2fa5e560880aab67e2459dff4492d9d4090c78
parent8e6f2ad9e1eed0be32b2a07dbfdc05a69339976f (diff)
fixed merge testcode
-rwxr-xr-xtests/merge/regen.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/merge/regen.sh b/tests/merge/regen.sh
index 822282e5..bec607cd 100755
--- a/tests/merge/regen.sh
+++ b/tests/merge/regen.sh
@@ -130,6 +130,16 @@ for db in $part_list; do
run londiste3 $v conf/londiste_$db.ini add-table mydata
done
+msg "Wait until add-table events are distributed to leafs"
+parts=$(echo "$part_list"|wc -w)
+for db in full1 full2; do
+cnt=0
+while test $cnt -ne $parts; do
+ sleep 5
+ cnt=`psql ${db} -Atc "select count(*) from londiste.table_info"`
+ echo "$db cnt=$cnt"
+done
+done
msg "Insert few rows"
for n in 1 2 3 4; do
@@ -140,11 +150,6 @@ msg "Create table and register it in merge nodes"
run_sql full1 "create table mydata (id int4 primary key, data text)"
run londiste3 $v conf/londiste_full1.ini add-table mydata
run londiste3 $v conf/londiste_part1_full1.ini add-table mydata --merge-all
-#for db in full1; do
-# for src in $part_list; do
-# run londiste3 $v conf/londiste_${src}_${db}.ini add-table mydata
-# done
-#done
msg "Wait until table is in sync on combined-root"
cnt=0
@@ -157,9 +162,7 @@ done
msg "Create table and register it in full nodes"
for db in full2; do
run londiste3 $v conf/londiste_$db.ini add-table mydata --create
- for src in $part_list; do
- run londiste3 $v conf/londiste_${src}_${db}.ini add-table mydata
- done
+ run londiste3 $v conf/londiste_part1_${db}.ini add-table mydata --merge-all
done
for db in full3 full4; do
run londiste3 $v conf/londiste_$db.ini add-table mydata --create