more tests

Author: kelvich

contrib/mmts/Cluster.pm

@@ -296,7 +296,7 @@ sub pgbench_async()
 		-p => $self->{nodes}->[$node]->port(),
 		'postgres',
 	);
-	# diag("running pgbench init");
+	diag("running pgbench: " . join(" ", @pgbench_command));
 	my $handle = IPC::Run::start(\@pgbench_command, $in, $out);
 	return $handle;
 }

contrib/mmts/t/004_recovery.pl

@@ -2,14 +2,58 @@
 use warnings;
 use Cluster;
 use TestLib;
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 my $cluster = new Cluster(3);
 $cluster->init();
 $cluster->configure();
 $cluster->start();
 sleep(10);
 
+########################################################
+# Check data integrity before and after recovery
+########################################################
+
+$cluster->pgbench(1, ('-i', -s => '10') );
+$cluster->pgbench(0, ('-n','-N', -T => '4') );
+$cluster->pgbench(1, ('-n','-N', -T => '4') );
+$cluster->pgbench(2, ('-n','-N', -T => '4') );
+
+
+my $hash0; my $hash1; my $hash2; my $oldhash;
+my $hash_query = "
+select
+    md5('(' || string_agg(aid::text || ', ' || abalance::text , '),(') || ')')
+from
+    (select * from pgbench_accounts order by aid) t;";
+
+$cluster->{nodes}->[2]->stop('fast');
+sleep(3);
+
+$cluster->pgbench(0, ('-n','-N', -T => '4') );
+$cluster->pgbench(1, ('-n','-N', -T => '4') );
+
+$cluster->psql(0, 'postgres', $hash_query, stdout => \$hash0);
+$cluster->psql(1, 'postgres', $hash_query, stdout => \$hash1);
+# $cluster->psql(2, 'postgres', $hash_query, stdout => \$hash2);
+
+is( ($hash0 == $hash1) , 1, "Check that hash is the same before recovery");
+$oldhash = $hash0;
+
+$cluster->{nodes}->[2]->start;
+sleep(10);
+
+$cluster->psql(0, 'postgres', $hash_query, stdout => \$hash0);
+$cluster->psql(1, 'postgres', $hash_query, stdout => \$hash1);
+$cluster->psql(2, 'postgres', $hash_query, stdout => \$hash2);
+
+diag("$oldhash, $hash0, $hash1, $hash2");
+is( (($hash0 == $hash1) and ($hash1 == $hash2) and ($oldhash == $hash0)) , 1, "Check that hash is the same after recovery");
+
+########################################################
+# Check start after all nodes were disconnected
+########################################################
+
 $cluster->psql(0, 'postgres', "create extension multimaster;
 	create table if not exists t(k int primary key, v int);");
 
@@ -18,14 +62,7 @@
 $cluster->psql(2, 'postgres', "insert into t values(3, 30);");
 sleep(2);
 
-
-my $sum0;
-my $sum1;
-my $sum2;
-
-########################################################
-# Check start after all nodes were disconnected
-########################################################
+my $sum0; my $sum1; my $sum2;
 
 $cluster->{nodes}->[1]->stop('fast');
 $cluster->{nodes}->[2]->stop('fast');
@@ -67,13 +104,19 @@
 sleep(10);
 
 # check data identity
-$cluster->psql(0, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum0);
-$cluster->psql(1, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum1);
-$cluster->psql(2, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum2);
-
-diag("Sums: $sum0, $sum1, $sum2");
-is($sum2, $sum0, "Check that sum_2 == sum_0");
-is($sum2, $sum1, "Check that sum_2 == sum_1");
+$cluster->psql(0, 'postgres', $hash_query, stdout => \$hash0);
+$cluster->psql(1, 'postgres', $hash_query, stdout => \$hash1);
+$cluster->psql(2, 'postgres', $hash_query, stdout => \$hash2);
+diag("$hash0, $hash1, $hash2");
+is( (($hash0 == $hash1) and ($hash1 == $hash2)) , 1, "Check that hash is the same");
+
+# $cluster->psql(0, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum0);
+# $cluster->psql(1, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum1);
+# $cluster->psql(2, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum2);
+
+# diag("Sums: $sum0, $sum1, $sum2");
+# is($sum2, $sum0, "Check that sum_2 == sum_0");
+# is($sum2, $sum1, "Check that sum_2 == sum_1");
 
 $cluster->{nodes}->[0]->stop('fast');
 $cluster->{nodes}->[1]->stop('fast');