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

knizhnik · knizhnik · commit f2f46a08d54a · 2016-08-11T17:29:33.000+03:00
diff --git a/contrib/mmts/Cluster.pm b/contrib/mmts/Cluster.pm
@@ -105,8 +105,6 @@ sub configure
 			multimaster.heartbeat_send_timeout = 250
 			multimaster.ignore_tables_without_pk = true
 			multimaster.twopc_min_timeout = 2000
-			raftable.id = $id
-			raftable.peers = '$raftpeers'
 		));
 
 		$node->append_conf("pg_hba.conf", qq(
diff --git a/contrib/mmts/docker/docker-entrypoint.sh b/contrib/mmts/docker/docker-entrypoint.sh
@@ -36,8 +36,6 @@ cat >> "$PGDATA/postgresql.conf" <<-EOF
 	multimaster.conn_strings = '$CONNS'
 	multimaster.use_raftable = true
 	multimaster.ignore_tables_without_pk = true
-	raftable.id = $NODEID
-	raftable.peers = '$PEERS'
 EOF
 
 "$@"
diff --git a/contrib/mmts/tests/reinit-mm.sh b/contrib/mmts/tests/reinit-mm.sh
@@ -36,8 +36,6 @@ do
     sed "s/5432/$port/g" < postgresql.conf.mm > node$i/postgresql.conf
     echo "multimaster.conn_strings = '$conn_str'" >> node$i/postgresql.conf
     echo "multimaster.node_id = $i" >> node$i/postgresql.conf
-	echo "raftable.id = $i" >> node$i/postgresql.conf
-	echo "raftable.peers = '$raft_conn_str'" >> node$i/postgresql.conf
 
     cp pg_hba.conf node$i
     pg_ctl -w -D node$i -l node$i.log start
diff --git a/contrib/mmts/tests2/client2.py b/contrib/mmts/tests2/client2.py
@@ -20,7 +20,7 @@ def __init__(self, name):
     def clear_values(self):
         self.max_latency = 0.0
         self.finish = {}
-    
+
     def start_tx(self):
         self.start_time = datetime.datetime.now()
 
@@ -34,7 +34,7 @@ def finish_tx(self, name):
             self.finish[name] = 1
         else:
             self.finish[name] += 1
-    
+
     def as_dict(self):
         return {
             'running_latency': (datetime.datetime.now() - self.start_time).total_seconds(),
@@ -43,13 +43,24 @@ def as_dict(self):
             'finish': copy.deepcopy(self.finish)
         }
 
+def keep_trying(tries, delay, method, name, *args, **kwargs):
+    for t in range(tries):
+        try:
+            return method(*args, **kwargs)
+        except Exception as e:
+            if t == tries - 1:
+                raise Exception("%s failed all %d tries" % (name, tries)) from e
+            print("%s failed [%d of %d]: %s" % (name, t + 1, tries, str(e)))
+            time.sleep(delay)
+    raise Exception("this should not happen")
+
 class MtmClient(object):
 
     def __init__(self, dsns, n_accounts=100000):
         self.n_accounts = n_accounts
         self.dsns = dsns
         self.aggregates = {}
-        self.initdb()
+        keep_trying(40, 1, self.initdb, 'self.initdb')
         self.running = True
         self.nodes_state_fields = ["id", "disabled", "disconnected", "catchUp", "slotLag",
             "avgTransDelay", "lastStatusChange", "oldestSnapshot", "SenderPid",
@@ -175,7 +186,7 @@ def run(self):
         asyncio.async(self.status())
 
         self.loop.run_forever()
-    
+
     def bgrun(self):
         print('Starting evloop in different process');
         self.parent_pipe, self.child_pipe = aioprocessing.AioPipe()
@@ -189,7 +200,7 @@ def get_status(self):
         resp = self.parent_pipe.recv()
         print('test: got status response')
         return resp
-    
+
     def stop(self):
         self.running = False
         self.evloop_process.terminate()
diff --git a/contrib/mmts/tests2/docker-entrypoint.sh b/contrib/mmts/tests2/docker-entrypoint.sh
@@ -6,7 +6,7 @@ if [ "${1:0:1}" = '-' ]; then
 	set -- postgres "$@"
 fi
 
-sudo sh -c 'echo "/pg/%p.%s.%c.%P.core" > /proc/sys/kernel/core_pattern'
+#echo "/pg/%p.%s.%c.%P.core" | sudo tee /proc/sys/kernel/core_pattern
 
 if [ "$1" = 'postgres' ]; then
 	mkdir -p "$PGDATA"
diff --git a/contrib/mmts/tests2/provision.yml b/contrib/mmts/tests2/provision.yml
@@ -132,8 +132,6 @@
     - "log_autovacuum_min_duration = 0"
     - "shared_preload_libraries = 'raftable,multimaster'"
     - "default_transaction_isolation = 'repeatable read'"
-    - "raftable.id = {{ node_id }}"
-    - "raftable.peers = '{{ raft_connstr }}'"
     - "multimaster.workers = 20"
     - "multimaster.arbiter_port = {{ 7777 }}"
     - "multimaster.use_raftable = true"
diff --git a/contrib/raftable/worker.c b/contrib/raftable/worker.c
@@ -237,7 +237,7 @@ static void on_message_recv(Client *c)
 		}
 		else
 		{
-			elog(WARNING, "emitted raft update %d", index);
+			elog(DEBUG1, "emitted raft update %d", index);
 			c->expect = index;
 			c->state = CLIENT_WAITING;
 		}
@@ -298,7 +298,7 @@ static void attend(Client *c)
 			if (c->state == CLIENT_SICK) return;
 			if (!c->msg) return;
 			if (c->cursor < c->msg->len) return;
-			elog(WARNING, "got %d bytes from client", (int)c->cursor);
+			elog(DEBUG1, "got %d bytes from client", (int)c->cursor);
 			on_message_recv(c);
 			break;
 		case CLIENT_RECVING:
@@ -324,7 +324,7 @@ static void notify(void)
 		Assert(c->expect >= 0);
 		if (!raft_applied(raft, server.id, c->expect)) continue;
 
-		elog(WARNING, "notify client %d that update %d is applied", i, c->expect);
+		elog(DEBUG1, "notify client %d that update %d is applied", i, c->expect);
 		answer = make_single_value_message("", NULL, 0, &answersize);
 		answer->meaning = MEAN_OK;
 		c->msg = palloc(sizeof(Message) + answersize);
