Remove raftable settings from postgresql.conf for tests, not used anymore.

kvap · kelvich · commit 545340038a7d · 2017-11-13T02:17:30.000+03:00
diff --git a/Cluster.pm b/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/docker/docker-entrypoint.sh b/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/tests/reinit-mm.sh b/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/tests2/provision.yml b/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"
