Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

Author: knizhnik

README

@@ -1,4 +1,4 @@
-pPostgreSQL Database Management System
+PostgreSQL Database Management System
 =====================================
 
 This directory contains the source code distribution of the PostgreSQL

contrib/mmts/testeaux/Combineaux.pm

@@ -0,0 +1,31 @@
+package Combineaux;
+
+use Troubleaux;
+use Stresseaux;
+use Starteaux;
+
+sub combine
+{
+	my ($stresses, $troubles) = @_;
+
+	my $cluster = Starteaux->deploy('lxc');
+
+	foreach my $stress (@$stresses)
+	{
+		foreach my $trouble (@$troubles)
+		{
+			print("--- $stress vs. $trouble ---\n");
+			my $id = "$stress+$trouble";
+			Stresseaux::start($id, $stress, $cluster) || die "stress wouldn't start";
+			sleep(1); # FIXME: will this work?
+			Troubleaux::cause($cluster, $trouble);
+			sleep(1); # FIXME: will this work?
+			Stresseaux::stop($id) || die "stress wouldn't stop";
+			Troubleaux::fix($cluster);
+		}
+	}
+
+	$cluster->destroy();
+}
+
+1;

contrib/mmts/testeaux/Starteaux.pm

@@ -0,0 +1,47 @@
+package Starteaux;
+
+sub deploy
+{
+	my ($class, $driver, @args) = @_;
+	my $self = {};
+	print("deploy cluster using driver $driver\n");
+	# fixme: implement
+	return bless $self, 'Starteaux';
+}
+
+sub up
+{
+	my ($self, $id) = @_;
+	print("up node $id\n");
+	# FIXME: implement
+}
+
+sub down
+{
+	my ($self, $id) = @_;
+	print("down node $id\n");
+	# FIXME: implement
+}
+
+sub drop
+{
+	my ($self, $src, $dst, $ratio) = @_;
+	print("drop $ratio packets from $src to $dst\n");
+	# FIXME: implement
+}
+
+sub delay
+{
+	my ($self, $src, $dst, $msec) = @_;
+	print("delay packets from $src to $dst by $msec msec\n");
+	# FIXME: implement
+}
+
+sub destroy
+{
+	my ($self) = @_;
+	print("destroy cluster $cluster\n");
+	# FIXME: implement
+}
+
+1;

contrib/mmts/testeaux/Stresseaux.pm

@@ -0,0 +1,38 @@
+package Stresseaux;
+
+my %running = ();
+
+sub start
+{
+	my ($id, $stressname, $cluster, @args) = @_;
+
+	if (exists $running{$id})
+	{
+		print("cannot start stress $stressname as $id: that id has already been taken\n");
+		return 0;
+	}
+
+	require "stress/$stressname.pm";
+	$running{$id} = "stress::$stressname"->start($id, $cluster, @args);
+
+	return 1;
+}
+
+sub stop
+{
+	my $id = shift;
+
+	my $stress = delete $running{$id};
+
+	if (!defined $stress)
+	{
+		print("cannot stop stress $id: that id is not running\n");
+		return 0;
+	}
+
+	$stress->stop();
+
+	return 1;
+}
+
+1;

contrib/mmts/testeaux/Testeaux.pm

@@ -0,0 +1,27 @@
+my @caused = ();
+
+package Troubleaux
+{
+	sub cause
+	{
+		my $cluster = shift;
+		my $troublename = shift;
+		my @args = @_;
+
+		require "trouble/$troublename.pm";
+		push @caused, "trouble::$troublename"->cause(@args);
+	}
+
+	sub fix
+	{
+		my ($cluster) = @_;
+
+		while (@caused)
+		{
+			my $trouble = pop @caused;
+			$trouble->fix();
+		}
+	}
+}
+
+1;

contrib/mmts/testeaux/Troubleaux.pm

@@ -1,8 +1,26 @@
 #!/usr/bin/perl
 
-use Testeaux;
+use Combineaux;
 
-Combineaux::combine(
-	['bank-transfers', 'pgbench-default'],
-	['split-brain', 'time-shift'],
-)
+sub list_modules
+{
+	my $dir = shift;
+	my @modules = ();
+
+	opendir DIR, $dir or die "Cannot open directory: $!";
+
+	while (my $file = readdir(DIR)) {
+		# Use a regular expression to ignore files beginning with a period
+		next unless ($file =~ m/\.pm$/);
+		push @modules, substr($file, 0, -3);
+	}
+
+	closedir DIR;
+
+	return @modules;
+}
+
+my @stresses = list_modules('stress');
+my @troubles = list_modules('trouble');
+
+Combineaux::combine(\@stresses, \@troubles);

contrib/mmts/testeaux/eaux.pl

@@ -0,0 +1,17 @@
+package stress::banktransfer;
+
+sub start
+{
+	my ($class, @args) = @_;
+	my $self = {};
+	print("start $class with args " . join(',', @args) . "\n");
+	return bless $self, $class;
+}
+
+sub stop
+{
+	my $self = shift;
+	print("stop $self\n");
+}
+
+1;

contrib/mmts/testeaux/stress/banktransfer.pm

@@ -0,0 +1,17 @@
+package stress::pgbench;
+
+sub start
+{
+	my ($class, @args) = @_;
+	my $self = {};
+	print("start $class with args " . join(',', @args) . "\n");
+	return bless $self, $class;
+}
+
+sub stop
+{
+	my $self = shift;
+	print("stop $self\n");
+}
+
+1;

contrib/mmts/testeaux/stress/pgbench.pm

@@ -0,0 +1,17 @@
+package trouble::splitbrain;
+
+sub cause
+{
+	my ($class, @args) = @_;
+	my $self = {};
+	print("cause $class with args " . join(',', @args) . "\n");
+	return bless $self, $class;
+}
+
+sub fix
+{
+	my $self = shift;
+	print("fix $self\n");
+}
+
+1;

contrib/mmts/testeaux/trouble/splitbrain.pm

@@ -0,0 +1,17 @@
+package trouble::timeshift;
+
+sub cause
+{
+	my $class = shift;
+	my $self = {};
+	print("cause $class with args " . join(',', @args) . "\n");
+	return bless $self, $class;
+}
+
+sub fix
+{
+	my $self = shift;
+	print("fix $self\n");
+}
+
+1;

contrib/mmts/testeaux/trouble/timeshift.pm

@@ -814,8 +814,8 @@ static void raft_handle_update(raft_t r, raft_msg_update_t *m) {
 
 	if (!m->empty && !m->snapshot && !raft_appendable(r, m->previndex, m->prevterm)) goto finish;
 
-	if (reply.progress.entries > 0) {
-		reply.term = RAFT_LOG(r, reply.progress.entries - 1).term;
+	if (RAFT_LOG_LAST_INDEX(r) >= 0) {
+		reply.term = RAFT_LOG(r, RAFT_LOG_LAST_INDEX(r)).term;
 	} else {
 		reply.term = -1;
 	}