Imporove sleep statistic reporting

knizhnik · knizhnik · commit e2050fa468a3 · 2015-11-13T14:32:50.000+03:00
diff --git a/pg_dtm.c b/pg_dtm.c
@@ -438,11 +438,21 @@ TransactionId DtmGetOldestXmin(Relation rel, bool ignoreVacuum)
 
 bool DtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
 {
+#if TRACE_SLEEP_TIME
+    static timestamp_t firstReportTime;
+    static timestamp_t prevReportTime;
+    static timestamp_t totalSleepTime;
+#endif
     timestamp_t delay = MIN_WAIT_TIMEOUT;
     Assert(xid != InvalidTransactionId);
 
     SpinLockAcquire(&local->lock);
 
+#if TRACE_SLEEP_TIME
+    if (firstReportTime == 0) {
+        firstReportTime = dtm_get_current_time();
+    }
+#endif
     while (true)
     {
         DtmTransStatus* ts = (DtmTransStatus*)hash_search(xid2status, &xid, HASH_FIND, NULL);
@@ -461,14 +471,11 @@ bool DtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
 #if TRACE_SLEEP_TIME
                 {
                 timestamp_t now = dtm_get_current_time();
-                static timestamp_t firstReportTime;
-                static timestamp_t prevReportTime;
-                static timestamp_t totalSleepTime;
 #endif
                 dtm_sleep(delay);
 #if TRACE_SLEEP_TIME
                 totalSleepTime += dtm_get_current_time() - now;
-                if (now > prevReportTime + USEC*10) { 
+                if (now > prevReportTime + USEC*1) { 
                     prevReportTime = now;
                     if (firstReportTime == 0) { 
                         firstReportTime = now;
diff --git a/tests/deploy/cluster.yml b/tests/deploy/cluster.yml
@@ -11,7 +11,7 @@
     pg_destroy_and_init: true
     pg_datadir: ./postgrespro-data
     pg_config_role: 
-    - line: "dtm.vacuum_delay=60"
+    - line: "dtm.vacuum_delay=1000"
 
   tasks:
 
diff --git a/tests/run.sh b/tests/run.sh
@@ -1,5 +1,4 @@
 ./dtmbench  \
 -c "dbname=postgres host=localhost user=knizhnik port=5432 sslmode=disable" \
 -c "dbname=postgres host=localhost user=knizhnik port=5433 sslmode=disable" \
--c "dbname=postgres host=localhost user=knizhnik port=5434 sslmode=disable" \
--n 1000 -a 1000 -w 10 -r 1 $*
+-n 10000 -a 1000 -w 10 -r 1 $*
diff --git a/tests/transfers.go b/tests/transfers.go
@@ -18,14 +18,14 @@ const (
 
 
 var cfg1 = pgx.ConnConfig{
-        Host:     "astro9",
-        Port:     15432,
+        Host:     "127.0.0.1",
+        Port:     5432,
         Database: "postgres",
     }
 
 var cfg2 = pgx.ConnConfig{
-        Host:     "astro9",
-        Port:     15433,
+        Host:     "127.0.0.1",
+        Port:     5433,
         Database: "postgres",
     }
 
@@ -109,8 +109,8 @@ func transfer(id int, wg *sync.WaitGroup) {
 
         gtid := strconv.Itoa(id) + "." + strconv.Itoa(i)
         amount := 2*rand.Intn(2) - 1
-        account1 := 2*id+1
-        account2 := 2*id+2
+        account1 := rand.Intn(N_ACCOUNTS)
+        account2 := rand.Intn(N_ACCOUNTS)
 
         exec(conn1, "begin transaction")
         exec(conn2, "begin transaction")
