tests

kelvich · kelvich · commit 37f0b475f5de · 2016-05-04T12:14:58.000+03:00
diff --git a/contrib/mmts/t/001_basic_recovery.pl b/contrib/mmts/t/001_basic_recovery.pl
@@ -3,8 +3,6 @@
 use Cluster;
 use TestLib;
 use Test::More tests => 3;
-use DBI;
-use DBD::Pg ':async';
 
 my $cluster = new Cluster(3);
 $cluster->init();
@@ -43,11 +41,13 @@
 diag("stopping node 2");
 $cluster->{nodes}->[2]->teardown_node;
 
-diag("sleeping 15");
-sleep(15);
+my $ret = $cluster->psql(0, 'postgres', "insert into t values(4, 40);");
+diag "tx1 status = $ret";
 
 diag("inserting 2");
-$cluster->psql(0, 'postgres', "insert into t values(2, 20);");
+my $ret = $cluster->psql(0, 'postgres', "insert into t values(2, 20);");
+diag "tx2 status = $ret";
+
 diag("selecting");
 $cluster->psql(1, 'postgres', "select v from t where k=2;", stdout => \$psql_out);
 diag("selected");
@@ -59,14 +59,18 @@
 
 diag("starting node 2");
 $cluster->{nodes}->[2]->start;
-diag("sleeping 10");
+#diag("sleeping 10");
 #sleep(10); # XXX: here we can poll
+
 $cluster->psql(0, 'postgres', "select mtm.poll_node(3);");
 diag("inserting 3");
+
 $cluster->psql(0, 'postgres', "insert into t values(3, 30);");
 diag("selecting");
+
 $cluster->psql(2, 'postgres', "select v from t where k=3;", stdout => \$psql_out);
 diag("selected");
+
 is($psql_out, '30', "Check replication after failed node recovery.");
 
 
diff --git a/contrib/mmts/testeaux/Cluster.pm b/contrib/mmts/testeaux/Cluster.pm
@@ -109,9 +109,9 @@ sub configure
 			multimaster.queue_size = 10485760 # 10mb
 			multimaster.node_id = $id
 			multimaster.conn_strings = '$connstr'
-			multimaster.use_raftable = true
+			multimaster.use_raftable = false
 			multimaster.ignore_tables_without_pk = true
-			multimaster.twopc_min_timeout = 60000
+			multimaster.twopc_min_timeout = 10000
 			raftable.id = $id
 			raftable.peers = '$raftpeers'
 		));
diff --git a/contrib/raftable/raft/Makefile b/contrib/raftable/raft/Makefile
@@ -1,6 +1,6 @@
 #override CC := clang
 override CFLAGS += -fpic -Wall -Wfatal-errors -O0 -g -pedantic -std=c99
-override CPPFLAGS += -I. -Iinclude -DDEBUG
+override CPPFLAGS += -I. -Iinclude #-DDEBUG
 override HEART_LDFLAGS += -Llib -lraft -ljansson
 
 AR = ar
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -1464,8 +1464,9 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 				default:
 					fprintf(stderr, "client %d aborted in state %d: %s",
 							st->id, st->state, PQerrorMessage(st->con));
-					PQclear(res);
-					return clientDone(st, false);
+					//PQclear(res);
+					//return clientDone(st, false);
+					break;
 			}
 			PQclear(res);
 			discard_response(st);
