mm relication test

kelvich · kelvich · commit 78e4e37b702b · 2016-03-31T17:59:53.000+03:00
diff --git a/contrib/mmts/t/001_basic_recovery.pl b/contrib/mmts/t/001_basic_recovery.pl
@@ -2,7 +2,7 @@
 use warnings;
 use PostgresNode;
 use TestLib;
-use Test::More tests => 2;
+use Test::More tests => 3;
 use DBI;
 use DBD::Pg ':async';
 
@@ -54,6 +54,7 @@ sub PostgresNode::inet_connstr {
 for (my $i=0; $i < $nnodes; $i++) {
    $nodes[$i]->append_conf('postgresql.conf', $pgconf_common);
    $nodes[$i]->append_conf('postgresql.conf', qq(
+      #port = ${ \$nodes[$i]->port }
       multimaster.node_id = @{[ $i + 1 ]}
       multimaster.conn_strings = '$mm_connstr'
       #multimaster.arbiter_port = ${ \$nodes[0]->port }
@@ -69,8 +70,8 @@ sub PostgresNode::inet_connstr {
 ###############################################################################
 
 my $psql_out;
-# XXX: change to poll_untill
-sleep(7);
+# XXX: create extension on start and poll_untill status is Online
+sleep(5);
 
 ###############################################################################
 # Replication check
@@ -79,11 +80,9 @@ sub PostgresNode::inet_connstr {
 $nodes[0]->psql('postgres', "
 	create extension multimaster;
 	create table if not exists t(k int primary key, v int);
-	insert into t values(1, 10);
-");
-
+	insert into t values(1, 10);");
 $nodes[1]->psql('postgres', "select v from t where k=1;", stdout => \$psql_out);
-is($psql_out, '10', "Check sanity while all nodes are up.");
+is($psql_out, '10', "Check replication while all nodes are up.");
 
 ###############################################################################
 # Isolation regress checks
@@ -97,30 +96,18 @@ sub PostgresNode::inet_connstr {
 
 $nodes[2]->teardown_node;
 
-# $nodes[0]->poll_query_until('postgres',
-#   "select disconnected = true from mtm.get_nodes_state() where id=3;")
-#   or die "Timed out while waiting for node to disconnect";
-
-$nodes[0]->psql('postgres', "
-	insert into t values(2, 20);
-");
-
+$nodes[0]->psql('postgres', "insert into t values(2, 20);");
 $nodes[1]->psql('postgres', "select v from t where k=2;", stdout => \$psql_out);
-is($psql_out, '20', "Check that we can commit after one node disconnect.");
-
-
-
-
-
-
-
-
-
-
-
-
-
+is($psql_out, '20', "Check replication after node failure.");
 
+###############################################################################
+# Work after node start
+###############################################################################
 
+$nodes[2]->start;
+sleep(5); # XXX: here we can poll
+$nodes[0]->psql('postgres', "insert into t values(3, 30);");
+$nodes[2]->psql('postgres', "select v from t where k=3;", stdout => \$psql_out);
+is($psql_out, '30', "Check replication after failed node recovery.");
 
 
