Merge branch 'master' of gitlab.postgrespro.ru:s.kelvich/pg_tsdtm

kelvich · kelvich · commit ad57f55c7349 · 2015-11-06T18:58:10.000+03:00
diff --git a/pg_dtm.c b/pg_dtm.c
@@ -393,6 +393,10 @@ static TransactionId DtmAdjustOldestXid(TransactionId xid)
         DtmTransStatus *ts, *prev = NULL;
         timestamp_t cutoff_time = dtm_get_current_time() - DtmVacuumDelay*USEC;
         SpinLockAcquire(&local->lock);
+        ts = (DtmTransStatus*)hash_search(xid2status, &xid, HASH_FIND, NULL);
+        if (ts != NULL) { 
+            cutoff_time = ts->cid - DtmVacuumDelay*USEC;
+        }                
         for (ts = local->trans_list_head; ts != NULL && ts->cid < cutoff_time; prev = ts, ts = ts->next) { 
             if (prev != NULL) { 
                 hash_search(xid2status, &prev->xid, HASH_REMOVE, NULL);
diff --git a/tests/deploy/cluster.yml b/tests/deploy/cluster.yml
@@ -10,6 +10,8 @@
     pg_version_tag: xtm_patched
     pg_destroy_and_init: true
     pg_datadir: ./postgrespro-data
+    pg_config_role: 
+    - line: "dtm.vacuum_delay=60"
 
   tasks:
 
diff --git a/tests/deploy/roles/postgres/vars/main.yml b/tests/deploy/roles/postgres/vars/main.yml
@@ -22,8 +22,8 @@ pg_config:
   - line: "fsync = off"
   - line: "autovacuum = off"
   - line: "listen_addresses = '*'"
-  - line: "max_connections = 512"
-  - line: "max_prepared_transactions = 400"
+  - line: "max_connections = 2048"
+  - line: "max_prepared_transactions = 4000"
   - line: "port = {{pg_port}}"
 pg_config_role:
   - line: "#pg_config_role"
diff --git a/tests/deploy/tsdm.yml b/tests/deploy/tsdm.yml
@@ -18,13 +18,6 @@
     pg_destroy_and_init: true
     pg_datadir: ~/postgrespro-data2
 
-  - role: postgres
-    pg_port: 5434
-    pg_repo: https://github.com/kelvich/postgresql.git
-    pg_version_tag: xtm_patched
-    pg_destroy_and_init: true
-    pg_datadir: ~/postgrespro-data3
-
   tasks:
 
   - name: clone dtm sources
@@ -54,19 +47,9 @@
       line: "shared_preload_libraries = 'pg_dtm'"
       state: present
 
-  - name: enable dtm extension on datanodes
-    lineinfile:
-      dest: "~/postgrespro-data3/postgresql.conf"
-      regexp: "^shared_preload_libraries "
-      line: "shared_preload_libraries = 'pg_dtm'"
-      state: present
-
   - name: restart postgrespro1
     command: "{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data -l ~/postgrespro-data/pg.log"
 
   - name: restart postgrespro2
-    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data2 -l ~/postgrespro-data/pg.log"
-
-  - name: restart postgrespro3
-    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data3 -l ~/postgrespro-data/pg.log"
+    command: "{{pg_dst}}/bin/pg_ctl restart -w -D ~/postgrespro-data2 -l ~/postgrespro-data2/pg.log"
 
diff --git a/tests/perf/transfers.go b/tests/perf/transfers.go
@@ -67,13 +67,14 @@ func (t TransfersTS) writer(id int, cCommits chan int, cAborts chan int, wg *syn
 
         gtid := strconv.Itoa(id) + "." + strconv.Itoa(i)
         amount := 2*rand.Intn(2) - 1
-        from_acc := cfg.Writers.StartId + 2*id + 1
-        to_acc   := cfg.Writers.StartId + 2*id + 2
-
+        from_acc := rand.Intn(cfg.AccountsNum)//cfg.Writers.StartId + 2*id + 1
+        to_acc   := rand.Intn(cfg.AccountsNum)//cfg.Writers.StartId + 2*id + 2
+        
         conn1 := conns[rand.Intn(len(conns))]
         conn2 := conns[rand.Intn(len(conns))]
-        if conn1 == conn2 {
-            continue
+        for conn1 == conn2 {
+            conn1 = conns[rand.Intn(len(conns))]
+            conn2 = conns[rand.Intn(len(conns))]
         }
 
         exec(conn1, "begin transaction")
diff --git a/tests/run_perf.sh b/tests/run_perf.sh
@@ -1,11 +1,9 @@
 go run perf/*.go  \
 -C "dbname=postgres port=5432 sslmode=disable" \
 -C "dbname=postgres port=5433 sslmode=disable" \
--C "dbname=postgres port=5434 sslmode=disable" \
--g -w 8 -r 1 -n 1000 -a 10000 -i
+-g -w 64 -r 1 -n 10000 -a 10000 -i
 
 go run perf/*.go  \
 -C "dbname=postgres port=5432 sslmode=disable" \
 -C "dbname=postgres port=5433 sslmode=disable" \
--C "dbname=postgres port=5434 sslmode=disable" \
--g -w 8 -r 1 -n 1000 -a 10000
+-g -w 64 -r 1 -n 10000 -a 10000
