Merge branch 'xtm' into xtm-replication

Author: kvap

contrib/pg_dtm/sockhub/sockhub.c

@@ -469,7 +469,7 @@ void ShubLoop(Shub* shub)
                 if (shub->params->delay != 0) { 
                     continue;
                 }
-            } 
+            }
             if (shub->in_buffer_used != 0) { /* if buffer is not empty... */
                 /* ...then send it */
 #if SHOW_SENT_STATISTIC

contrib/pg_dtm/tests/deploy_layouts/cluster.yml

@@ -1,17 +1,17 @@
 ---
 - hosts: nodes[1]
-  roles:
-  - role: postgrespro
-    deploy_dtm: true
+  # roles:
+  # - role: postgrespro
+  #   deploy_dtm: true
 
 - hosts: nodes
   roles:
   - role: postgrespro
     pg_port: 15432
     deploy_postgres: true
     pg_dtm_enable: true
-    pg_dtm_enable: false
-    # pg_config_role:
-    #   - line: "dtm.buffer_size = 65536"
-    pg_dtm_host: "{{ groups['nodes'][0] }}"
+    pg_config_role:
+      - line: "dtm.vacuum_delay = 1"
+    # pg_dtm_host: "{{ groups['nodes'][0] }}"
+
 

contrib/pg_dtm/tests/deploy_layouts/roles/postgrespro/tasks/postgres.yml

@@ -7,18 +7,18 @@
 - name: remove dtm.so
   shell: rm -f {{pg_dst}}/lib/pg_dtm.so
 
-- name: build dtm extension
-  shell: make clean && make && make install
-  args:
-    chdir: "{{pg_src}}/contrib/pg_dtm"
-    creates: "{{pg_dst}}/lib/pg_dtm.so"
-
-# - name: build ts-dtm extension
+# - name: build dtm extension
 #   shell: make clean && make && make install
 #   args:
-#     chdir: "{{pg_src}}/contrib/pg_tsdtm"
+#     chdir: "{{pg_src}}/contrib/pg_dtm"
 #     creates: "{{pg_dst}}/lib/pg_dtm.so"
 
+- name: build ts-dtm extension
+  shell: make clean && make && make install
+  args:
+    chdir: "{{pg_src}}/contrib/pg_tsdtm"
+    creates: "{{pg_dst}}/lib/pg_dtm.so"
+
 - stat: path={{pg_datadir}}/postmaster.pid
   register: pg_pidfile
 

contrib/pg_dtm/tests/deploy_layouts/single.yml

@@ -2,8 +2,8 @@
 - hosts: nodes[-1]
   roles:
 
-  - role: postgrespro
-    deploy_dtm: true
+  # - role: postgrespro
+  #   deploy_dtm: true
 
   - role: postgrespro
     deploy_postgres: true

contrib/pg_dtm/tests/farms/sai

@@ -7,7 +7,7 @@
 158.250.29.6 ansible_ssh_user=cluster offset=4001
 158.250.29.8 ansible_ssh_user=cluster offset=2001
 158.250.29.9 ansible_ssh_user=cluster offset=1001
-158.250.29.10 ansible_ssh_user=cluster offset=1
+#158.250.29.10 ansible_ssh_user=cluster offset=1
 
 [master]
 158.250.29.10 ansible_ssh_user=cluster offset=1

contrib/pg_tsdtm/pg_dtm.c

@@ -39,6 +39,8 @@
 
 #define USEC 1000000
 
+#define TRACE_SLEEP_TIME 1
+
 typedef uint64 timestamp_t;
 
 typedef struct DtmTransStatus
@@ -72,7 +74,10 @@ static HTAB* xid2status;
 static HTAB* gtid2xid;
 static DtmNodeState* local;
 static DtmTransState dtm_tx;
-
+static timestamp_t firstReportTime;
+static timestamp_t prevReportTime;
+static timestamp_t totalSleepTime;
+static uint64 totalSleepInterrupts;
 static int DtmVacuumDelay;
 
 static Snapshot DtmGetSnapshot(Snapshot snapshot);
@@ -110,12 +115,28 @@ static void dtm_sleep(timestamp_t interval)
 {
     struct timespec ts;
     struct timespec rem;
-    ts.tv_sec = interval / USEC;
-    ts.tv_nsec = interval % USEC * 1000;
+#if TRACE_SLEEP_TIME
+    timestamp_t now = dtm_get_current_time();
+#endif
+    ts.tv_sec = 0;
+    ts.tv_nsec = interval*1000;
+
     while (nanosleep(&ts, &rem) < 0) { 
+        totalSleepInterrupts += 1;
         Assert(errno == EINTR);
         ts = rem;
     }
+#if TRACE_SLEEP_TIME
+    totalSleepTime += dtm_get_current_time() - now;
+    if (now > prevReportTime + USEC*10) { 
+        prevReportTime = now;
+        if (firstReportTime == 0) { 
+            firstReportTime = now;
+        } else { 
+            fprintf(stderr, "Sleep %lu of %lu usec (%f%%)\n", totalSleepTime, now - firstReportTime, totalSleepTime*100.0/(now - firstReportTime));
+        }
+    }
+#endif
 }
 
 static cid_t dtm_get_cid()