rebuild extensions on provision

kelvich · kelvich · commit 51dc4dae2ef7 · 2016-05-13T15:13:27.000+03:00
diff --git a/contrib/mmts/testeaux/lib/RemoteNode.pm b/contrib/mmts/testeaux/lib/RemoteNode.pm
@@ -27,6 +27,7 @@ sub new
 
 	$self->execute("sudo iptables -F");
 	$self->execute("sudo iptables -A INPUT -p tcp --dport ssh -j ACCEPT");
+	$self->execute("sudo iptables -A OUTPUT -p tcp --sport ssh -m state --state ESTABLISHED,RELATED  -j ACCEPT");
 
 	return $self;
 }
@@ -152,8 +153,8 @@ sub net_deny_out
 sub net_allow
 {
 	my ($self)  = @_;
-	$self->execute("sudo iptables -D INPUT -j DROP");
-	$self->execute("sudo iptables -D OUTPUT -j DROP");
+	$self->execute("sudo iptables -D INPUT -j DROP || true");
+	$self->execute("sudo iptables -D OUTPUT -j DROP || true");
 }
 
 1;
diff --git a/contrib/mmts/testeaux/provision.yml b/contrib/mmts/testeaux/provision.yml
@@ -9,3 +9,14 @@
     pg_version_tag: master
     pg_destroy_and_init: true
 
+  tasks:
+  - name: build raftable
+    shell: "make clean && make -j {{makejobs}} install"
+    args:
+      chdir: "{{pg_src}}/contrib/raftable"
+
+  - name: build multimaster
+    shell: "make clean && make -j {{makejobs}} install"
+    args:
+      chdir: "{{pg_src}}/contrib/mmts"
+
diff --git a/contrib/mmts/testeaux/run_splits.pl b/contrib/mmts/testeaux/run_splits.pl
@@ -23,7 +23,11 @@
 	'postgres'
 );
 
-my $pgbench1 = IPC::Run::start (
+my $out = '';
+my $err = '';
+my $in = '';
+
+my @pgb_params = (
 	'pgbench',
 	-c => 4,
 	-T => 30,
@@ -33,16 +37,20 @@
 	'postgres'
 );
 
+
+
+my $pgbench1 = IPC::Run::start @pgb_params; #, \$in, \$out, \$err;
+
 sleep 5;
-$cluster->{nodes}->[0]->net_deny_in;
+$cluster->{nodes}->[2]->net_deny_out;
+$cluster->{nodes}->[2]->net_deny_in;
 sleep 10;
-$cluster->{nodes}->[0]->net_allow;
-
+$cluster->{nodes}->[2]->net_allow;
 
 IPC::Run::finish($pgbench1);
-# IPC::Run::run @pgbench_init
-
 
+print("---stdout--\n$out\n");
+print("---stderr--\n$err\n");
 
 
 
diff --git a/contrib/mmts/testeaux/stress/banktransfer.pm b/contrib/mmts/testeaux/stress/banktransfer.pm
@@ -1,5 +1,10 @@
 package stress::banktransfer;
 
+sub init
+{
+
+}
+
 sub start
 {
 	my ($class, @args) = @_;

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ sub new`
`27`	`27`
`28`	`28`	`$self->execute("sudo iptables -F");`
`29`	`29`	`$self->execute("sudo iptables -A INPUT -p tcp --dport ssh -j ACCEPT");`
	`30`	`+ $self->execute("sudo iptables -A OUTPUT -p tcp --sport ssh -m state --state ESTABLISHED,RELATED -j ACCEPT");`
`30`	`31`
`31`	`32`	`return $self;`
`32`	`33`	`}`
`@@ -152,8 +153,8 @@ sub net_deny_out`
`152`	`153`	`sub net_allow`
`153`	`154`	`{`
`154`	`155`	`my ($self) = @_;`
`155`		`- $self->execute("sudo iptables -D INPUT -j DROP");`
`156`		`- $self->execute("sudo iptables -D OUTPUT -j DROP");`
	`156`	`+ $self->execute("sudo iptables -D INPUT -j DROP \|\| true");`
	`157`	`+ $self->execute("sudo iptables -D OUTPUT -j DROP \|\| true");`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`1;`