Detect too late snapshot

knizhnik · knizhnik · commit af5213a4d2b0 · 2016-01-02T12:30:01.000+03:00
diff --git a/contrib/multimaster/multimaster.c b/contrib/multimaster/multimaster.c
@@ -88,6 +88,7 @@ static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn);
 static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
 static void DtmUpdateRecentXmin(Snapshot snapshot);
 static void DtmInitialize(void);
+static void DtmSubXactCallback(XactEvent event, void *arg);
 static void DtmXactCallback(XactEvent event, void *arg);
 static TransactionId DtmGetNextXid(void);
 static TransactionId DtmGetNewTransactionId(bool isSubXact);
@@ -733,6 +734,7 @@ static void DtmInitialize()
         dtm->initialized = false;
         BgwPoolInit(&dtm->pool, MMExecutor, MMDatabaseName, MMQueueSize);
 		RegisterXactCallback(DtmXactCallback, NULL);
+		RegisterSubXactCallback(DtmSubXactCallback, NULL);
 	}
 	LWLockRelease(AddinShmemInitLock);
 
@@ -762,6 +764,12 @@ static void DtmInitialize()
 	TM = &DtmTM;
 }
 
+static void
+DtmSubXactCallback(XactEvent event, void *arg)
+{
+	elog(ERROR, "Subtransactions are not currently supported");
+}
+
 static void
 DtmXactCallback(XactEvent event, void *arg)
 {
diff --git a/contrib/pg_dtm/pg_dtm.c b/contrib/pg_dtm/pg_dtm.c
@@ -74,6 +74,7 @@ static XidStatus DtmGetTransactionStatus(TransactionId xid, XLogRecPtr *lsn);
 static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, TransactionId *subxids, XidStatus status, XLogRecPtr lsn);
 static void DtmUpdateRecentXmin(Snapshot snapshot);
 static void DtmInitialize(void);
+static void DtmSubXactCallback(XactEvent event, void *arg);
 static void DtmXactCallback(XactEvent event, void *arg);
 static TransactionId DtmGetNextXid(void);
 static TransactionId DtmGetNewTransactionId(bool isSubXact);
@@ -105,7 +106,6 @@ static SnapshotData DtmSnapshot = { HeapTupleSatisfiesMVCC };
 static bool DtmHasGlobalSnapshot;
 static bool DtmGlobalXidAssigned;
 static int DtmLocalXidReserve;
-static int DtmCurcid;
 static Snapshot DtmLastSnapshot;
 static TransactionManager DtmTM = {
 	DtmGetTransactionStatus,
@@ -605,9 +605,9 @@ static Snapshot DtmGetSnapshot(Snapshot snapshot)
 	}
 	if (TransactionIdIsValid(DtmNextXid) && snapshot != &CatalogSnapshotData)
 	{
-		if (!DtmHasGlobalSnapshot && (snapshot != DtmLastSnapshot || DtmCurcid != snapshot->curcid))
+		if (!DtmHasGlobalSnapshot) { 
 			DtmGlobalGetSnapshot(DtmNextXid, &DtmSnapshot, &dtm->minXid);
-		DtmCurcid = snapshot->curcid;
+		}
 		DtmLastSnapshot = snapshot;
 		DtmMergeWithGlobalSnapshot(snapshot);
 		if (!IsolationUsesXactSnapshot())
@@ -717,6 +717,7 @@ static void DtmInitialize()
 		dtm->nReservedXids = 0;
 		dtm->minXid = InvalidTransactionId;
 		RegisterXactCallback(DtmXactCallback, NULL);
+		RegisterSubXactCallback(DtmSubXactCallback, NULL);
 	}
 	LWLockRelease(AddinShmemInitLock);
 
@@ -735,6 +736,12 @@ static void DtmInitialize()
 	TM = &DtmTM;
 }
 
+static void
+DtmSubXactCallback(XactEvent event, void *arg)
+{
+	elog(ERROR, "Subtransactions are not currently supported");
+}
+
 static void
 DtmXactCallback(XactEvent event, void *arg)
 {
diff --git a/contrib/pg_tsdtm/pg_dtm.c b/contrib/pg_tsdtm/pg_dtm.c
@@ -176,7 +176,7 @@ static cid_t dtm_sync(cid_t global_cid)
         SpinLockAcquire(&local->lock);
     }
 #endif
-    return global_cid;
+    return local_cid;
 }
 
 void
@@ -641,7 +641,10 @@ cid_t DtmLocalAccess(DtmCurrentTrans* x, GlobalTransactionId gtid, cid_t global_
         x->is_global = true;
     }
     SpinLockRelease(&local->lock);
-    return local_cid;
+	if (global_cid < local_cid - DtmVacuumDelay*USEC) { 
+		elog(ERROR, "Too old snapshot");
+	}
+    return global_cid;
 }
 
 void DtmLocalBeginPrepare(GlobalTransactionId gtid)

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ static cid_t dtm_sync(cid_t global_cid)`
`176`	`176`	`SpinLockAcquire(&local->lock);`
`177`	`177`	`}`
`178`	`178`	`#endif`
`179`		`- return global_cid;`
	`179`	`+ return local_cid;`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`void`
`@@ -641,7 +641,10 @@ cid_t DtmLocalAccess(DtmCurrentTrans* x, GlobalTransactionId gtid, cid_t global_`
`641`	`641`	`x->is_global = true;`
`642`	`642`	`}`
`643`	`643`	`SpinLockRelease(&local->lock);`
`644`		`- return local_cid;`
	`644`	`+ if (global_cid < local_cid - DtmVacuumDelay*USEC) {`
	`645`	`+ elog(ERROR, "Too old snapshot");`
	`646`	`+ }`
	`647`	`+ return global_cid;`
`645`	`648`	`}`
`646`	`649`
`647`	`650`	`void DtmLocalBeginPrepare(GlobalTransactionId gtid)`