NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitf9a1b2a

committed

Correctly handle case of equal connections

1 parent7a47f56 commitf9a1b2aCopy full SHA for f9a1b2a

File tree

5 files changed

+13

-29

lines changed

tests
- deploy
  - cluster.yml
  - roles/postgres/vars
    - main.yml
  - tsdm.yml
- perf
  - transfers.go
- run_perf.sh

5 files changed

+13

-29

lines changed

`‎tests/deploy/cluster.yml‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`pg_version_tag:xtm_patched`
`11`	`11`	`pg_destroy_and_init:true`
`12`	`12`	`pg_datadir:./postgrespro-data`
	`13`	`+pg_config_role:`
	`14`	`+ -line:"dtm.vacuum_delay=10"`
`13`	`15`
`14`	`16`	`tasks:`
`15`	`17`

`‎tests/deploy/roles/postgres/vars/main.yml‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ pg_config:`
`22`	`22`	`-line:"fsync = off"`
`23`	`23`	`-line:"autovacuum = off"`
`24`	`24`	`-line:"listen_addresses = '*'"`
`25`		`- -line:"max_connections =512"`
`26`		`- -line:"max_prepared_transactions =400"`
	`25`	`+ -line:"max_connections =2048"`
	`26`	`+ -line:"max_prepared_transactions =4000"`
`27`	`27`	`-line:"port = {{pg_port}}"`
`28`	`28`	`pg_config_role:`
`29`	`29`	`-line:"#pg_config_role"`

`‎tests/deploy/tsdm.yml‎`

Lines changed: 1 addition & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,6 @@`
`18`	`18`	`pg_destroy_and_init:true`
`19`	`19`	`pg_datadir:~/postgrespro-data2`
`20`	`20`
`21`		`- -role:postgres`
`22`		`-pg_port:5434`
`23`		`-pg_repo:https://github.com/kelvich/postgresql.git`
`24`		`-pg_version_tag:xtm_patched`
`25`		`-pg_destroy_and_init:true`
`26`		`-pg_datadir:~/postgrespro-data3`
`27`		`-`
`28`	`21`	`tasks:`
`29`	`22`
`30`	`23`	`-name:clone dtm sources`
`@@ -54,19 +47,9 @@`
`54`	`47`	`line:"shared_preload_libraries = 'pg_dtm'"`
`55`	`48`	`state:present`
`56`	`49`
`57`		`- -name:enable dtm extension on datanodes`
`58`		`-lineinfile:`
`59`		`-dest:"~/postgrespro-data3/postgresql.conf"`
`60`		`-regexp:"^shared_preload_libraries"`
`61`		`-line:"shared_preload_libraries = 'pg_dtm'"`
`62`		`-state:present`
`63`		`-`
`64`	`50`	`-name:restart postgrespro1`
`65`	`51`	`command:"{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data -l ~/postgrespro-data/pg.log"`
`66`	`52`
`67`	`53`	`-name:restart postgrespro2`
`68`		`-command:"{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data2 -l ~/postgrespro-data/pg.log"`
`69`		`-`
`70`		`- -name:restart postgrespro3`
`71`		`-command:"{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data3 -l ~/postgrespro-data/pg.log"`
	`54`	`+command:"{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data2 -l ~/postgrespro-data2/pg.log"`
`72`	`55`

`‎tests/perf/transfers.go‎`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,14 @@ func (t TransfersTS) writer(id int, cCommits chan int, cAborts chan int, wg *syn`
`67`	`67`
`68`	`68`	`gtid:=strconv.Itoa(id)+"."+strconv.Itoa(i)`
`69`	`69`	`amount:=2*rand.Intn(2)-1`
`70`		`-from_acc:=cfg.Writers.StartId+2*id+1`
`71`		`-to_acc:=cfg.Writers.StartId+2*id+2`
`72`		`-`
	`70`	`+from_acc:=rand.Intn(cfg.AccountsNum)//cfg.Writers.StartId + 2*id + 1`
	`71`	`+to_acc:=rand.Intn(cfg.AccountsNum)//cfg.Writers.StartId + 2*id + 2`
	`72`	`+`
`73`	`73`	`conn1:=conns[rand.Intn(len(conns))]`
`74`	`74`	`conn2:=conns[rand.Intn(len(conns))]`
`75`		`-ifconn1==conn2 {`
`76`		`-continue`
	`75`	`+forconn1==conn2 {`
	`76`	`+conn1=conns[rand.Intn(len(conns))]`
	`77`	`+conn2=conns[rand.Intn(len(conns))]`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`exec(conn1,"begin transaction")`

`‎tests/run_perf.sh‎`

100644100755

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`	`1`	`go run perf/*.go \`
`2`	`2`	`-C"dbname=postgres port=5432 sslmode=disable" \`
`3`	`3`	`-C"dbname=postgres port=5433 sslmode=disable" \`
`4`		`--C"dbname=postgres port=5434 sslmode=disable" \`
`5`		`--g -w 8 -r 1 -n 1000 -a 10000 -i`
	`4`	`+-g -w 64 -r 1 -n 10000 -a 10000 -i`
`6`	`5`
`7`	`6`	`go run perf/*.go \`
`8`	`7`	`-C"dbname=postgres port=5432 sslmode=disable" \`
`9`	`8`	`-C"dbname=postgres port=5433 sslmode=disable" \`
`10`		`--C"dbname=postgres port=5434 sslmode=disable" \`
`11`		`--g -w 8 -r 1 -n 1000 -a 10000`
	`9`	`+-g -w 64 -r 1 -n 10000 -a 10000`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf9a1b2a

File tree

5 files changed

5 files changed

`‎tests/deploy/cluster.yml‎`

`‎tests/deploy/roles/postgres/vars/main.yml‎`

`‎tests/deploy/tsdm.yml‎`

`‎tests/perf/transfers.go‎`

`‎tests/run_perf.sh‎`

0 commit comments