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

Commit f0d434f

Browse files
kelvichkelvich
committed
Try direct connection without toxiproxy
1 parent 0eaaa1c commit f0d434f

File tree

3 files changed

+70
-54
lines changed

3 files changed

+70
-54
lines changed

‎tests2/docker-compose.yml

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ services:
1010
POSTGRES_USER: 'pg'
1111
POSTGRES_DB: 'regression'
1212
NODE_ID: 1
13+
# CONNSTRS: >-
14+
# dbname=regression user=pg host=node1,
15+
# dbname=regression user=pg host=toxi port=12000 arbiterport=12001,
16+
# dbname=regression user=pg host=toxi port=13000 arbiterport=13001
1317
CONNSTRS: >-
1418
dbname=regression user=pg host=node1,
15-
dbname=regression user=pg host=toxi port=12000 arbiterport=12001,
16-
dbname=regression user=pg host=toxi port=13000 arbiterport=13001
19+
dbname=regression user=pg host=node2,
20+
dbname=regression user=pg host=node3
1721
ports:
1822
- "15432:5432"
1923

@@ -25,10 +29,14 @@ services:
2529
POSTGRES_USER: 'pg'
2630
POSTGRES_DB: 'regression'
2731
NODE_ID: 2
32+
# CONNSTRS: >-
33+
# dbname=regression user=pg host=toxi port=21000 arbiterport=21001,
34+
# dbname=regression user=pg host=node2,
35+
# dbname=regression user=pg host=toxi port=23000 arbiterport=23001
2836
CONNSTRS: >-
29-
dbname=regression user=pg host=toxi port=21000 arbiterport=21001,
37+
dbname=regression user=pg host=node1,
3038
dbname=regression user=pg host=node2,
31-
dbname=regression user=pg host=toxi port=23000 arbiterport=23001
39+
dbname=regression user=pg host=node3
3240
ports:
3341
- "15433:5432"
3442

@@ -40,40 +48,44 @@ services:
4048
POSTGRES_USER: 'pg'
4149
POSTGRES_DB: 'regression'
4250
NODE_ID: 3
51+
# CONNSTRS: >-
52+
# dbname=regression user=pg host=toxi port=31000 arbiterport=31001,
53+
# dbname=regression user=pg host=toxi port=32000 arbiterport=32001,
54+
# dbname=regression user=pg host=node3
4355
CONNSTRS: >-
44-
dbname=regression user=pg host=toxi port=31000 arbiterport=31001,
45-
dbname=regression user=pg host=toxi port=32000 arbiterport=32001,
56+
dbname=regression user=pg host=node1,
57+
dbname=regression user=pg host=node2,
4658
dbname=regression user=pg host=node3
4759
ports:
4860
- "15434:5432"
4961

50-
toxi:
51-
image: kelvich/toxiproxy
52-
ports:
53-
- "8474:8474"
62+
# toxi:
63+
# image: kelvich/toxiproxy
64+
# ports:
65+
# - "8474:8474"
5466

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"},
67+
# toxi_seed:
68+
# image: kelvich/toxiproxy
69+
# depends_on:
70+
# - toxi
71+
# entrypoint: |
72+
# curl
73+
# -X POST 'http://toxi:8474/populate'
74+
# -H 'Content-Type: application/json; charset=utf-8'
75+
# -d
76+
# '[
77+
# {"name": "rep12", "listen": "0.0.0.0:12000", "upstream": "node2:5432"},
78+
# {"name": "arb12", "listen": "0.0.0.0:12001", "upstream": "node2:5433"},
79+
# {"name": "rep13", "listen": "0.0.0.0:13000", "upstream": "node3:5432"},
80+
# {"name": "arb13", "listen": "0.0.0.0:13001", "upstream": "node3:5433"},
6981

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"},
82+
# {"name": "rep21", "listen": "0.0.0.0:21000", "upstream": "node1:5432"},
83+
# {"name": "arb21", "listen": "0.0.0.0:21001", "upstream": "node1:5433"},
84+
# {"name": "rep23", "listen": "0.0.0.0:23000", "upstream": "node3:5432"},
85+
# {"name": "arb23", "listen": "0.0.0.0:23001", "upstream": "node3:5433"},
7486

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-
]'
87+
# {"name": "rep31", "listen": "0.0.0.0:31000", "upstream": "node1:5432"},
88+
# {"name": "arb31", "listen": "0.0.0.0:31001", "upstream": "node1:5433"},
89+
# {"name": "rep32", "listen": "0.0.0.0:32000", "upstream": "node2:5432"},
90+
# {"name": "arb32", "listen": "0.0.0.0:32001", "upstream": "node2:5433"}
91+
# ]'

‎tests2/lib/bank_client.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,12 @@ def exec_tx(self, tx_block, aggname_prefix, conn_i):
131131
while self.running:
132132
agg.start_tx()
133133
try:
134-
yield from cur.execute('commit')
134+
# yield from cur.execute('commit')
135135
yield from tx_block(conn, cur, agg)
136136
agg.finish_tx('commit')
137+
except psycopg2.OperationalError as e:
138+
yield from cur.execute('rollback')
139+
agg.finish_tx('operational_rollback')
137140
except psycopg2.Error as e:
138141
agg.finish_tx(e.pgerror)
139142
print("We've count to infinity!")

‎tests2/test_recovery.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
class RecoveryTest(unittest.TestCase):
1111
@classmethod
1212
def setUpClass(self):
13-
subprocess.check_call(['docker-compose','up',
14-
'--force-recreate',
15-
'-d'])
13+
# subprocess.check_call(['docker-compose','up',
14+
# '--force-recreate',
15+
# '-d'])
1616

1717
# XXX: add normal wait here
18-
time.sleep(30)
18+
# time.sleep(30)
1919
self.client = MtmClient([
2020
"dbname=regression user=postgres host=127.0.0.1 port=15432",
2121
"dbname=regression user=postgres host=127.0.0.1 port=15433",
@@ -30,29 +30,30 @@ def setUpClass(self):
3030
def tearDownClass(self):
3131
print('tearDown')
3232
self.client.stop()
33+
# subprocess.check_call(['docker-compose','down'])
3334

34-
def test_normal_operations(self):
35-
print('### normalOpsTest ###')
35+
# def test_normal_operations(self):
36+
# print('### normalOpsTest ###')
3637

37-
for i in range(3):
38-
time.sleep(3)
39-
aggs = self.client.get_status()
40-
MtmClient.print_aggregates(aggs)
41-
print(aggs)
42-
for agg in aggs:
43-
self.assertTrue( aggs[agg]['finish']['commit'] > 0 )
38+
# for i in range(3):
39+
# time.sleep(3)
40+
# aggs = self.client.get_status()
41+
# MtmClient.print_aggregates(aggs)
42+
# print(aggs)
43+
# for agg in aggs:
44+
# self.assertTrue( aggs[agg]['finish']['commit'] > 0 )
4445

4546
def test_node_partition(self):
4647
print('### nodePartitionTest ###')
4748

48-
print('### split node3 ###')
49-
for proxy in ['rep31', 'rep32', 'rep23', 'rep13', 'arb31', 'arb32', 'arb23', 'arb13']:
50-
self.toxiproxy.get_proxy(proxy).disable()
49+
# print('### split node3 ###')
50+
# for proxy in ['rep31', 'rep32', 'rep23', 'rep13', 'arb31', 'arb32', 'arb23', 'arb13']:
51+
# self.toxiproxy.get_proxy(proxy).disable()
5152

5253
# clear tx history
5354
self.client.get_status()
5455

55-
for i in range(5):
56+
for i in range(1000):
5657
print(i, datetime.datetime.now())
5758
time.sleep(3)
5859
aggs = self.client.get_status()
@@ -64,9 +65,9 @@ def test_node_partition(self):
6465
self.assertTrue( aggs['sumtotal_1']['isolation'] == 0)
6566
self.assertTrue( aggs['sumtotal_2']['isolation'] == 0)
6667

67-
print('### join node3 ###')
68-
for proxy in ['rep31', 'rep32', 'rep23', 'rep13', 'arb31', 'arb32', 'arb23', 'arb13']:
69-
self.toxiproxy.get_proxy(proxy).enable()
68+
# print('### join node3 ###')
69+
# for proxy in ['rep31', 'rep32', 'rep23', 'rep13', 'arb31', 'arb32', 'arb23', 'arb13']:
70+
# self.toxiproxy.get_proxy(proxy).enable()
7071

7172
# clear tx history
7273
self.client.get_status()

0 commit comments

Comments
 (0)