Make it possible to switch off DTM

knizhnik · knizhnik · commit 82b8301ff972 · 2016-04-13T14:53:18.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -182,6 +182,7 @@ int   MtmKeepaliveTimeout;
 int   MtmReconnectAttempts;
 int   MtmNodeDisableDelay;
 bool  MtmUseRaftable;
+bool  MtmUseDtm;
 MtmConnectionInfo* MtmConnections;
 
 static char* MtmConnStrs;
@@ -340,7 +341,7 @@ TransactionId MtmGetOldestXmin(Relation rel, bool ignoreVacuum)
 }
 
 bool MtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
-{
+{	
 #if TRACE_SLEEP_TIME
     static timestamp_t firstReportTime;
     static timestamp_t prevReportTime;
@@ -350,6 +351,10 @@ bool MtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
     timestamp_t delay = MIN_WAIT_TIMEOUT;
     Assert(xid != InvalidTransactionId);
 
+	if (!MtmUseDtm) { 
+		return PgXidInMVCCSnapshot(xid, snapshot);
+	}
+	
 	MtmLock(LW_SHARED);
 
 #if TRACE_SLEEP_TIME
@@ -769,7 +774,7 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 		tm->state = ts;	
 		ts->votingCompleted = true;
 		if (Mtm->status != MTM_RECOVERY) { 
-			MtmSendNotificationMessage(ts, MSG_READY); /* send notification to coordinator */
+			MtmSendNotificationMessage(ts, MtmUseDtm ? MSG_READY : MSG_PREPARED); /* send notification to coordinator */
 		} else {
 			ts->status = TRANSACTION_STATUS_UNKNOWN;
 		}
@@ -1652,6 +1657,19 @@ _PG_init(void)
 		NULL
 	);
 
+	DefineCustomBoolVariable(
+		"multimaster.use_dtm",
+		"Use distributed transaction manager",
+		NULL,
+		&MtmUseDtm,
+		true,
+		PGC_BACKEND,
+		0,
+		NULL,
+		NULL,
+		NULL
+	);
+
 	DefineCustomIntVariable(
 		"multimaster.workers",
 		"Number of multimaster executor workers per node",
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -7,7 +7,7 @@
 
 #include "pglogical_output/hooks.h"
 
-#define  DEBUG_LEVEL 1
+#define  DEBUG_LEVEL 0
 
 #if DEBUG_LEVEL == 0
 #define MTM_LOG1(fmt, ...) elog(LOG, fmt, ## __VA_ARGS__) 
@@ -191,6 +191,7 @@ extern int   MtmConnectTimeout;
 extern int   MtmReconnectAttempts;
 extern int   MtmKeepaliveTimeout;
 extern int   MtmNodeDisableDelay;
+extern bool  MtmUseDtm;
 extern HTAB* MtmXid2State;
 
 extern MtmConnectionInfo* MtmConnections;
diff --git a/contrib/mmts/tests/deploy_layouts/cluster.yml b/contrib/mmts/tests/deploy_layouts/cluster.yml
@@ -1,41 +1,5 @@
 ---
 
-- hosts: nodes[0]
-
-  roles:
-  - role: postgres
-    pg_port: 15432
-    pg_repo: https://github.com/postgrespro/postgres_cluster.git
-    pg_version_tag: master
-    pg_destroy_and_init: true
-
-  tasks:
-  - name: build sockhub
-    shell: "make clean && make -j 4"
-    args:
-      chdir: "~/pg_cluster/src/contrib/arbiter/sockhub"
-
-  - name: build dtm
-    shell: "make clean && make -j 4"
-    args:
-      chdir: "~/pg_cluster/src/contrib/arbiter"
-    # when: dtm_sources.changed
-
-  - name: kill arbiter
-    shell: kill -9 `cat ~/pg_cluster/dtm_data/arbiter.pid` || true
-
-  - name: ensure datadir for dtm exists
-    shell: "rm -rf ~/pg_cluster/dtm_data && mkdir ~/pg_cluster/dtm_data"
-
-  - name: start dtm
-    shell: >
-      nohup ~/pg_cluster/src/contrib/arbiter/bin/arbiter
-      -d ~/pg_cluster/dtm_data -r 0.0.0.0:5431 -i 0 -l ~/pg_cluster/dtm_data/log &
-
-  - name: wait until dtm is available
-    wait_for: port=5431 delay=1
-
-
 - hosts: nodes[1]:nodes[2]:nodes[3]
   # accelerate: true
 
@@ -61,10 +25,10 @@
     set_fact:
       connections: "{{ connstrs.results | map(attribute='ansible_facts.connstr') | join(', ') }}"
 
-  - name: build sockhub
-    shell: "make clean && make -j 4"
+  - name: build raftable
+    shell: "make clean && make -j {{makejobs}} install"
     args:
-      chdir: "{{pg_src}}/contrib/arbiter/sockhub"
+      chdir: "{{pg_src}}/contrib/raftable"
 
   - name: build multimaster
     shell: "make clean && make -j {{makejobs}} install"
@@ -81,13 +45,17 @@
     - "max_wal_senders = 10"
     - "wal_sender_timeout = 0"
     - "max_replication_slots = 10"
+    - "max_connections = 200"
     - "max_worker_processes = 100"
-    - "shared_preload_libraries = 'multimaster'"
-    - "multimaster.arbiters = '{{groups['nodes'][0]}}:5431'"
+    - "shared_preload_libraries = 'raftable,multimaster'"
     - "multimaster.conn_strings = '{{connections}}'"
     - "multimaster.node_id = {{ node_id }}"
+    - "multimaster.buffer_size = 65536"
     - "multimaster.queue_size = 1073741824"
+    - "multimaster.arbiter_port = 5600"
+    - "multimaster.vacuum_delay = 1"
     - "multimaster.workers = 32"
+    - "multimaster.use_dtm = 0"
 
   - name: restart postgrespro
     command: "{{pg_dst}}/bin/pg_ctl restart -w -D {{pg_datadir}} -l {{pg_datadir}}/pg.log"
diff --git a/contrib/mmts/tests/perf.results b/contrib/mmts/tests/perf.results
@@ -138,3 +138,16 @@ Bench finished at Пн. февр. 15 18:37:50 MSK 2016
 Bench started at Пн. февр. 15 18:44:02 MSK 2016
 astro5:{tps:121774.204222, transactions:100000000, selects:200000000, updates:0, aborts:0, abort_percent: 0, readers:0, writers:200, update_percent:0, accounts:500000, iterations:500000, hosts:3}
 Bench finished at Пн. февр. 15 18:57:44 MSK 2016
+Bench started at Ср. апр. 13 13:52:07 MSK 2016
+
+Bench finished at Ср. апр. 13 13:52:07 MSK 2016
+Bench started at Ср. апр. 13 13:52:45 MSK 2016
+Bench started at Ср. апр. 13 14:03:54 MSK 2016
+astro5:{tps:115156.025890, transactions:50000000, selects:100000000, updates:0, aborts:0, abort_percent: 0, readers:0, writers:100, update_percent:0, accounts:500000, iterations:500000, hosts:3}
+Bench finished at Ср. апр. 13 14:11:09 MSK 2016
+Bench started at Ср. апр. 13 14:13:55 MSK 2016
+astro5:{tps:16576.973635, transactions:1000000, selects:0, updates:2000758, aborts:820, abort_percent: 0, readers:0, writers:100, update_percent:100, accounts:500000, iterations:10000, hosts:3}
+Bench finished at Ср. апр. 13 14:14:56 MSK 2016
+Bench started at Ср. апр. 13 14:23:33 MSK 2016
+astro5:{tps:16078.719352, transactions:1000000, selects:0, updates:2000802, aborts:788, abort_percent: 0, readers:0, writers:100, update_percent:100, accounts:500000, iterations:10000, hosts:3}
+Bench finished at Ср. апр. 13 14:24:36 MSK 2016
diff --git a/contrib/mmts/tests/perf.yml b/contrib/mmts/tests/perf.yml
@@ -46,7 +46,7 @@
   - name: run transfers
     shell: >
       ~/pg_cluster/install/bin/dtmbench {{connections}}
-      -w {{ nconns }} -r 0 -n 500000 -a 500000 -p {{ up }} |
+      -w {{ nconns }} -r 0 -n 10000 -a 500000 -p {{ up }} |
       tee -a perf.results |
       sed "s/^/`hostname`:/"
     register: transfers_result
