Update ansible scripts to support dtmacid test

knizhnik · knizhnik · commit edf5f00be015 · 2016-04-29T11:44:40.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -426,9 +426,6 @@ bool MtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
             else
             {
                 bool invisible = ts->status != TRANSACTION_STATUS_COMMITTED;
-				if (invisible != PgXidInMVCCSnapshot(xid, snapshot)) { 
-					fprintf(stderr, "Change visibility for XID %d(csn=%ld, status=%d) in snapshot %ld [%d,%d]\n", xid, ts->csn, ts->status, MtmTx.snapshot, snapshot->xmin, snapshot->xmax);
-				}
                 MTM_LOG4("%d: tuple with xid=%d(csn= %ld) is %s in snapshot %ld",
 						 MyProcPid, xid, ts->csn, invisible ? "rollbacked" : "committed", MtmTx.snapshot);
                 MtmUnlock();
@@ -459,7 +456,7 @@ MtmAdjustOldestXid(TransactionId xid)
 	csn_t oldestSnapshot = INVALID_CSN;
 	MtmTransState *prev = NULL;
 	MtmTransState *ts = (MtmTransState*)hash_search(MtmXid2State, &xid, HASH_FIND, NULL);
-	MTM_LOG1("%d: MtmAdjustOldestXid(%d): snapshot=%ld, csn=%ld, status=%d", MyProcPid, xid, ts != NULL ? ts->snapshot : 0, ts != NULL ? ts->csn : 0, ts != NULL ? ts->status : -1);
+	MTM_LOG2("%d: MtmAdjustOldestXid(%d): snapshot=%ld, csn=%ld, status=%d", MyProcPid, xid, ts != NULL ? ts->snapshot : 0, ts != NULL ? ts->csn : 0, ts != NULL ? ts->status : -1);
 	Mtm->gcCount = 0;
 	if (ts != NULL) { 
 		oldestSnapshot = ts->snapshot;
@@ -492,7 +489,7 @@ MtmAdjustOldestXid(TransactionId xid)
 		if (prev != NULL) { 
 			Mtm->transListHead = prev;
 			Mtm->oldestXid = xid = prev->xid;            
-			MTM_LOG1("%d: MtmAdjustOldestXid: oldestXid=%d, olderstSnapshot=%ld", MyProcPid, xid, oldestSnapshot);
+			MTM_LOG2("%d: MtmAdjustOldestXid: oldestXid=%d, olderstSnapshot=%ld", MyProcPid, xid, oldestSnapshot);
 		} else if (TransactionIdPrecedes(Mtm->oldestXid, xid)) {  
 			xid = Mtm->oldestXid;
 		}
diff --git a/contrib/mmts/tests/acid.yml b/contrib/mmts/tests/acid.yml
@@ -0,0 +1,60 @@
+---
+
+- hosts: nodes[-1]
+  gather_facts: no
+  tasks:
+
+  - name: create mm ext
+    shell: >
+      ~/pg_cluster/install/bin/psql -p 15432 postgres -c "drop extension if exists multimaster";
+      ~/pg_cluster/install/bin/psql -p 15432 postgres -c "drop table if exists t";
+      ~/pg_cluster/install/bin/psql -p 15432 postgres -c 'create extension multimaster;';
+      ~/pg_cluster/install/bin/psql -p 15432 postgres -c 'create table t(u int primary key, v int);';
+
+- hosts: clients
+  gather_facts: no
+  tasks:
+
+  - name: generate connstrings
+    set_fact:
+      connstr: "-c 'host={{item}} user={{ansible_ssh_user}} port=15432 dbname=postgres' "
+    with_items:
+      groups['nodes'] | reverse | batch(nnodes | d(1) | int) | first
+    register: connstrs
+
+  - name: make a list
+    set_fact:
+      connections: "{{ connstrs.results | map(attribute='ansible_facts.connstr') | join }}"
+
+- hosts: clients[0]
+  gather_facts: no
+  tasks:
+  - name: init database
+    shell: "~/pg_cluster/install/bin/dtmacid {{connections}} -a 100 -i"
+    register: init_result
+    environment:
+      LD_LIBRARY_PATH: "/home/{{ansible_ssh_user}}/pg_cluster/install/lib"
+
+  - debug: var=init_result
+
+- hosts: clients
+  gather_facts: no
+  tasks:
+
+  - local_action: shell echo "Bench started at `date`" >> perf.results
+
+  - name: run transfers
+    shell: >
+      ~/pg_cluster/install/bin/dtmacid {{connections}}
+      -w {{ nconns }} -w 4 -r 2 -n 100000 -a 100  |
+      tee -a perf.results |
+      sed "s/^/`hostname`:/"
+    register: transfers_result
+    environment:
+      LD_LIBRARY_PATH: "/home/{{ansible_ssh_user}}/pg_cluster/install/lib"
+
+  - debug: var=transfers_result
+
+  - local_action: 'shell echo "{{transfers_result.stdout }}" >> perf.results'
+
+  - local_action: shell echo "Bench finished at `date`" >> perf.results
diff --git a/contrib/mmts/tests/deploy_layouts/cluster.yml b/contrib/mmts/tests/deploy_layouts/cluster.yml
@@ -70,6 +70,7 @@
     copy: src=../{{item}} dest=~/{{item}} mode=0755
     with_items:
       - "dtmbench.cpp"
+      - "dtmacid.cpp"
 
   - name: clone pqxx
     git: repo=https://github.com/Ambrosys/pqxx.git
@@ -96,4 +97,11 @@
   - name: install dtmbench
     shell: "mv dtmbench ~/pg_cluster/install/bin/dtmbench"
 
+  - name: compile dtmacid
+    shell: "g++ -g -Wall -O2 -o dtmacid dtmacid.cpp -lpqxx -lpq -pthread -L/home/{{ansible_ssh_user}}/pg_cluster/install/lib/ -I/home/{{ansible_ssh_user}}/pg_cluster/install/include/"
+
+  - name: install dtmacid
+    shell: "mv dtmacid ~/pg_cluster/install/bin/dtmacid"
+
+
 
diff --git a/contrib/mmts/tests/dtmacid.cpp b/contrib/mmts/tests/dtmacid.cpp
@@ -140,15 +140,17 @@ void* reader(void* arg)
 		assert((int)r1.size() == cfg.nAccounts && (int)r2.size() == cfg.nAccounts);
 		for (int i=0; i < cfg.nAccounts; i++) { 
 			int diff = r1[i][0].as(int()) - r2[i][0].as(int());
+#if 0
 			fprintf(out, "%d: %d %c %d - [%d,%d]->[%ld,%ld] (snapshot %ld, last CSN %ld) vs. [%d,%d]->[%ld,%ld] (snapshot %ld, last CSN %ld)\n",
 					i, r1[i][0].as(int()), diff < 0 ? '<' : diff == 0 ? '=' : '>', r2[i][0].as(int()), 
 					r1[i][1].as(int()), r1[i][2].as(int()), r1[i][3].as(int64_t()), r1[i][4].as(int64_t()), r1[i][5].as(int64_t()), r1[i][6].as(int64_t()), 
 					r2[i][1].as(int()), r2[i][2].as(int()), r2[i][3].as(int64_t()), r2[i][4].as(int64_t()), r2[i][5].as(int64_t()), r2[i][6].as(int64_t()));
+#endif
 			if (diff != 0) { 
 				if (delta == 0) { 
 					delta = diff;
 					if (delta < 0) lt++; else gt++;
-				} else if (delta != diff) { 
+				} else if ((delta ^ diff) < 0) { 
 					fflush(out);
 					printf("Inconsistency found for record %d: [%d,%d]->[%ld,%ld] (snapshot %ld, last CSN %ld) vs. [%d,%d]->[%ld,%ld] (snapshot %ld, last CSN %ld)\n", i, 
 						   r1[i][1].as(int()), r1[i][2].as(int()), r1[i][3].as(int64_t()), r1[i][4].as(int64_t()), r1[i][5].as(int64_t()), r1[i][6].as(int64_t()), 
