Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5453400

Browse files
kvapkelvich
authored andcommitted
Remove raftable settings from postgresql.conf for tests, not used anymore.
1 parent c2f83ca commit 5453400

File tree

4 files changed

+0
-8
lines changed

4 files changed

+0
-8
lines changed

Cluster.pm

-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ sub configure
105105
multimaster.heartbeat_send_timeout = 250
106106
multimaster.ignore_tables_without_pk = true
107107
multimaster.twopc_min_timeout = 2000
108-
raftable.id = $id
109-
raftable.peers = '$raftpeers'
110108
));
111109

112110
$node->append_conf("pg_hba.conf", qq(

docker/docker-entrypoint.sh

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ cat >> "$PGDATA/postgresql.conf" <<-EOF
3636
multimaster.conn_strings = '$CONNS'
3737
multimaster.use_raftable = true
3838
multimaster.ignore_tables_without_pk = true
39-
raftable.id = $NODEID
40-
raftable.peers = '$PEERS'
4139
EOF
4240

4341
"$@"

tests/reinit-mm.sh

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ do
3636
sed "s/5432/$port/g" < postgresql.conf.mm > node$i/postgresql.conf
3737
echo "multimaster.conn_strings = '$conn_str'" >> node$i/postgresql.conf
3838
echo "multimaster.node_id = $i" >> node$i/postgresql.conf
39-
echo "raftable.id = $i" >> node$i/postgresql.conf
40-
echo "raftable.peers = '$raft_conn_str'" >> node$i/postgresql.conf
4139

4240
cp pg_hba.conf node$i
4341
pg_ctl -w -D node$i -l node$i.log start

tests2/provision.yml

-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@
132132
- "log_autovacuum_min_duration = 0"
133133
- "shared_preload_libraries = 'raftable,multimaster'"
134134
- "default_transaction_isolation = 'repeatable read'"
135-
- "raftable.id = {{ node_id }}"
136-
- "raftable.peers = '{{ raft_connstr }}'"
137135
- "multimaster.workers = 20"
138136
- "multimaster.arbiter_port = {{ 7777 }}"
139137
- "multimaster.use_raftable = true"

0 commit comments

Comments
 (0)