Add delays to DTX

knizhnik · knizhnik · commit 1b8271efa173 · 2015-09-10T19:43:29.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -80,12 +80,21 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)
 static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn)
 {
     XidStatus status = CLOGTransactionIdGetStatus(xid, lsn);
-    if (status == TRANSACTION_STATUS_IN_PROGRESS && DtmHasSnapshot) { 
-        DtmEnsureConnection();    
-        status = DtmGlobalGetTransStatus(DtmConn, DtmNodeId, xid);
-        if (status != TRANSACTION_STATUS_IN_PROGRESS) { 
-            CLOGTransactionIdSetTreeStatus(xid, 0, NULL, status, InvalidXLogRecPtr);
+    if (status == TRANSACTION_STATUS_IN_PROGRESS && DtmHasSnapshot && !TransactionIdIsInProgress(xid)) { 
+        unsigned delay = 1000;
+        while (true) { 
+            DtmEnsureConnection();    
+            status = DtmGlobalGetTransStatus(DtmConn, DtmNodeId, xid);
+            if (status == TRANSACTION_STATUS_IN_PROGRESS) { 
+                pg_usleep(delay);
+                if (delay < 100000)  { 
+                    delay *= 2;
+                }
+            } else { 
+                break;
+            }
         }
+        CLOGTransactionIdSetTreeStatus(xid, 0, NULL, status, InvalidXLogRecPtr);
     }
     return status;
 }
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
@@ -318,8 +318,10 @@ HeapTupleSatisfiesSelf(HeapTuple htup, Snapshot snapshot, Buffer buffer)
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
+#if 1
 		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 					InvalidTransactionId);
+#endif
 		return true;
 	}
 
@@ -695,8 +697,10 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
+#if 1
 		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 					InvalidTransactionId);
+#endif
 		return HeapTupleMayBeUpdated;
 	}
 
@@ -738,7 +742,7 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,
  * token is also returned in snapshot->speculativeToken.
  */
 bool
-HeapTupleSatisfiesDirtyVerbose(HeapTuple htup, Snapshot snapshot,
+HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,
 						Buffer buffer)
 {
 	HeapTupleHeader tuple = htup->t_data;
@@ -915,8 +919,10 @@ HeapTupleSatisfiesDirtyVerbose(HeapTuple htup, Snapshot snapshot,
 	if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
 	{
 		/* it must have aborted or crashed */
+#if 1
 		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 					InvalidTransactionId);
+#endif
 		return true;
 	}
 
@@ -1125,8 +1131,10 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 		if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))
 		{
 			/* it must have aborted or crashed */
+#if 1
 			SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 						InvalidTransactionId);
+#endif
 			return true;
 		}
 
@@ -1296,8 +1304,10 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
 			{
 				if (TransactionIdIsInProgress(HeapTupleHeaderGetRawXmax(tuple)))
 					return HEAPTUPLE_LIVE;
+#if 1
 				SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 							InvalidTransactionId);
+#endif
 			}
 		}
 
@@ -1354,7 +1364,9 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
 		 * Not in Progress, Not Committed, so either Aborted or crashed.
 		 * Remove the Xmax.
 		 */
+#if 1
 		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, InvalidTransactionId);
+#endif
 		return HEAPTUPLE_LIVE;
 	}
 
@@ -1370,8 +1382,10 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
 			/*
 			 * Not in Progress, Not Committed, so either Aborted or crashed
 			 */
+#if 1
 			SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,
 						InvalidTransactionId);
+#endif
 			return HEAPTUPLE_LIVE;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -318,8 +318,10 @@ HeapTupleSatisfiesSelf(HeapTuple htup, Snapshot snapshot, Buffer buffer)`
`318`	`318`	`if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))`
`319`	`319`	`{`
`320`	`320`	`/* it must have aborted or crashed */`
	`321`	`+#if 1`
`321`	`322`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`322`	`323`	`InvalidTransactionId);`
	`324`	`+#endif`
`323`	`325`	`return true;`
`324`	`326`	`}`
`325`	`327`
`@@ -695,8 +697,10 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,`
`695`	`697`	`if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))`
`696`	`698`	`{`
`697`	`699`	`/* it must have aborted or crashed */`
	`700`	`+#if 1`
`698`	`701`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`699`	`702`	`InvalidTransactionId);`
	`703`	`+#endif`
`700`	`704`	`return HeapTupleMayBeUpdated;`
`701`	`705`	`}`
`702`	`706`
`@@ -738,7 +742,7 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,`
`738`	`742`	`* token is also returned in snapshot->speculativeToken.`
`739`	`743`	`*/`
`740`	`744`	`bool`
`741`		`-HeapTupleSatisfiesDirtyVerbose(HeapTuple htup, Snapshot snapshot,`
	`745`	`+HeapTupleSatisfiesDirty(HeapTuple htup, Snapshot snapshot,`
`742`	`746`	`Buffer buffer)`
`743`	`747`	`{`
`744`	`748`	`HeapTupleHeader tuple = htup->t_data;`
`@@ -915,8 +919,10 @@ HeapTupleSatisfiesDirtyVerbose(HeapTuple htup, Snapshot snapshot,`
`915`	`919`	`if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))`
`916`	`920`	`{`
`917`	`921`	`/* it must have aborted or crashed */`
	`922`	`+#if 1`
`918`	`923`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`919`	`924`	`InvalidTransactionId);`
	`925`	`+#endif`
`920`	`926`	`return true;`
`921`	`927`	`}`
`922`	`928`
`@@ -1125,8 +1131,10 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,`
`1125`	`1131`	`if (!TransactionIdDidCommit(HeapTupleHeaderGetRawXmax(tuple)))`
`1126`	`1132`	`{`
`1127`	`1133`	`/* it must have aborted or crashed */`
	`1134`	`+#if 1`
`1128`	`1135`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`1129`	`1136`	`InvalidTransactionId);`
	`1137`	`+#endif`
`1130`	`1138`	`return true;`
`1131`	`1139`	`}`
`1132`	`1140`
`@@ -1296,8 +1304,10 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,`
`1296`	`1304`	`{`
`1297`	`1305`	`if (TransactionIdIsInProgress(HeapTupleHeaderGetRawXmax(tuple)))`
`1298`	`1306`	`return HEAPTUPLE_LIVE;`
	`1307`	`+#if 1`
`1299`	`1308`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`1300`	`1309`	`InvalidTransactionId);`
	`1310`	`+#endif`
`1301`	`1311`	`}`
`1302`	`1312`	`}`
`1303`	`1313`
`@@ -1354,7 +1364,9 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,`
`1354`	`1364`	`* Not in Progress, Not Committed, so either Aborted or crashed.`
`1355`	`1365`	`* Remove the Xmax.`
`1356`	`1366`	`*/`
	`1367`	`+#if 1`
`1357`	`1368`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, InvalidTransactionId);`
	`1369`	`+#endif`
`1358`	`1370`	`return HEAPTUPLE_LIVE;`
`1359`	`1371`	`}`
`1360`	`1372`
`@@ -1370,8 +1382,10 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,`
`1370`	`1382`	`/*`
`1371`	`1383`	`* Not in Progress, Not Committed, so either Aborted or crashed`
`1372`	`1384`	`*/`
	`1385`	`+#if 1`
`1373`	`1386`	`SetHintBits(tuple, buffer, HEAP_XMAX_INVALID,`
`1374`	`1387`	`InvalidTransactionId);`
	`1388`	`+#endif`
`1375`	`1389`	`return HEAPTUPLE_LIVE;`
`1376`	`1390`	`}`
`1377`	`1391`