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

Commit bfb0ac2

Browse files
committed
Route all connections in tests to toxiproxy
1 parent ad2bd06 commit bfb0ac2

File tree

3 files changed

+46
-1
lines changed

3 files changed

+46
-1
lines changed

tests2/docker-compose.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ services:
1010
POSTGRES_USER: 'pg'
1111
POSTGRES_DB: 'regression'
1212
NODE_ID: 1
13+
CONNSTR: |
14+
dbname=regression user=pg host=node1 arbiterport=5433,
15+
dbname=regression user=pg host=toxi port=12000 arbiterport=12001,
16+
dbname=regression user=pg host=toxi port=13000 arbiterport=13001
1317
ports:
1418
- "15432:5432"
1519

@@ -21,6 +25,10 @@ services:
2125
POSTGRES_USER: 'pg'
2226
POSTGRES_DB: 'regression'
2327
NODE_ID: 2
28+
CONNSTR: |
29+
dbname=regression user=pg host=toxi port=21000 arbiterport=21001,
30+
dbname=regression user=pg host=node2 arbiterport=5433,
31+
dbname=regression user=pg host=toxi port=23000 arbiterport=23001
2432
ports:
2533
- "15433:5432"
2634

@@ -32,6 +40,40 @@ services:
3240
POSTGRES_USER: 'pg'
3341
POSTGRES_DB: 'regression'
3442
NODE_ID: 3
43+
CONNSTR: |
44+
dbname=regression user=pg host=toxi port=31000 arbiterport=31001,
45+
dbname=regression user=pg host=toxi port=32000 arbiterport=32001,
46+
dbname=regression user=pg host=node3 arbiterport=5433
3547
ports:
3648
- "15434:5432"
3749

50+
toxi:
51+
image: kelvich/toxiproxy
52+
ports:
53+
- "8474:8474"
54+
55+
toxi_seed:
56+
image: kelvich/toxiproxy
57+
depends_on:
58+
- toxi
59+
entrypoint: |
60+
curl
61+
-X POST 'http://toxi:8474/populate'
62+
-H 'Content-Type: application/json; charset=utf-8'
63+
-d
64+
'[
65+
{"name": "rep12", "listen": "0.0.0.0:12000", "upstream": "node2:5432"},
66+
{"name": "arb12", "listen": "0.0.0.0:12001", "upstream": "node2:5433"},
67+
{"name": "rep13", "listen": "0.0.0.0:13000", "upstream": "node3:5432"},
68+
{"name": "arb13", "listen": "0.0.0.0:13001", "upstream": "node3:5433"},
69+
70+
{"name": "rep21", "listen": "0.0.0.0:21000", "upstream": "node1:5432"},
71+
{"name": "arb21", "listen": "0.0.0.0:21001", "upstream": "node1:5433"},
72+
{"name": "rep23", "listen": "0.0.0.0:23000", "upstream": "node3:5432"},
73+
{"name": "arb23", "listen": "0.0.0.0:23001", "upstream": "node3:5433"},
74+
75+
{"name": "rep31", "listen": "0.0.0.0:31000", "upstream": "node1:5432"},
76+
{"name": "arb31", "listen": "0.0.0.0:31001", "upstream": "node1:5433"},
77+
{"name": "rep32", "listen": "0.0.0.0:32000", "upstream": "node2:5432"},
78+
{"name": "arb32", "listen": "0.0.0.0:32001", "upstream": "node2:5433"}
79+
]'

tests2/docker-entrypoint.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ if [ "$1" = 'postgres' ]; then
4040

4141
############################################################################
4242

43-
CONNSTRS="dbname=$POSTGRES_DB user=$POSTGRES_USER host=node1, dbname=$POSTGRES_DB user=$POSTGRES_USER host=node2, dbname=$POSTGRES_DB user=$POSTGRES_USER host=node3"
43+
# CONNSTRS="\
44+
# dbname=$POSTGRES_DB user=$POSTGRES_USER host=node1, \
45+
# dbname=$POSTGRES_DB user=$POSTGRES_USER host=node2, \
46+
# dbname=$POSTGRES_DB user=$POSTGRES_USER host=node3"
4447

4548
cat <<-EOF >> $PGDATA/postgresql.conf
4649
listen_addresses='*'

tests2/lib/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)