Correctly handle two phase transation commit

knizhnik · knizhnik · commit e25ebfb3f7d9 · 2015-11-13T17:42:56.000+03:00
diff --git a/contrib/pg_dtm/tests/dtmbench.cpp b/contrib/pg_dtm/tests/dtmbench.cpp
@@ -190,13 +190,21 @@ void* writer(void* arg)
             i -= 1;
             continue;
         }
-        pipeline srcPipe(srcTx);
-        pipeline dstPipe(dstTx);
-        srcPipe.insert("commit transaction");
-        dstPipe.insert("commit transaction");
-        srcPipe.complete();
-        dstPipe.complete();
-        
+        try { 
+            pipeline srcPipe(srcTx);
+            pipeline dstPipe(dstTx);
+            pipeline::query_id q1 = srcPipe.insert("commit transaction");
+            pipeline::query_id q2 = dstPipe.insert("commit transaction");
+            //srcPipe.complete();
+            //dstPipe.complete();
+            srcPipe.retrieve(q1);
+            dstPipe.retrieve(q2);
+        } catch (pqxx_exception const& x) { 
+            t.aborts += 1;
+            i -= 1;
+            continue;
+        }
+       
         t.proceeded += 1;
     }
     return NULL;
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -1313,6 +1313,7 @@ RecordTransactionCommit(void)
 		END_CRIT_SECTION();
         if (!committed) {
             CurrentTransactionState->state = TRANS_ABORT;
+            CurrentTransactionState->blockState = TBLOCK_ABORT_PENDING;
             elog(ERROR, "Transaction commit rejected by XTM");
         }
 	}

Original file line number	Diff line number	Diff line change
`@@ -1313,6 +1313,7 @@ RecordTransactionCommit(void)`
`1313`	`1313`	`END_CRIT_SECTION();`
`1314`	`1314`	`if (!committed) {`
`1315`	`1315`	`CurrentTransactionState->state = TRANS_ABORT;`
	`1316`	`+ CurrentTransactionState->blockState = TBLOCK_ABORT_PENDING;`
`1316`	`1317`	`elog(ERROR, "Transaction commit rejected by XTM");`
`1317`	`1318`	`}`
`1318`	`1319`	`}`