init global_snapshot_xmin on start of new global tx

kelvich · kelvich · commit b9e89b528f78 · 2018-02-19T15:33:26.000+03:00
diff --git a/src/backend/access/transam/global_snapshot.c b/src/backend/access/transam/global_snapshot.c
@@ -95,6 +95,7 @@ DtmCurrentTrans dtm_tx; // XXXX: make static
 
 static bool DtmXidInMVCCSnapshot(TransactionId xid, Snapshot snapshot);
 static void DtmAdjustOldestXid(void);
+static void DtmInitGlobalXmin(TransactionId xid);
 static bool DtmDetectGlobalDeadLock(PGPROC *proc);
 static void DtmAddSubtransactions(DtmTransStatus * ts, TransactionId *subxids, int nSubxids);
 static char const *DtmGetName(void);
@@ -365,6 +366,17 @@ DtmAdjustOldestXid()
 	// elog(LOG, "DtmAdjustOldestXid total=%d, deleted=%d, xid=%d, prev=%p, ts=%p", total, deleted, oldest_xid, prev, ts);
 }
 
+static void
+DtmInitGlobalXmin(TransactionId xid)
+{
+	TransactionId current_xmin;
+
+	/* Better change to CAS */
+	current_xmin = ProcArrayGetGlobalSnapshotXmin();
+	if (!TransactionIdIsValid(current_xmin))
+		ProcArraySetGlobalSnapshotXmin(xid);
+}
+
 
 /*
  * Check tuple bisibility based on CSN of current transaction.
@@ -503,6 +515,7 @@ DtmLocalExtend(GlobalTransactionId gtid)
 		SpinLockRelease(&local->lock);
 	}
 	x->is_global = true;
+	DtmInitGlobalXmin(x->xid);
 	return x->snapshot;
 }
 
@@ -524,6 +537,7 @@ DtmLocalAccess(DtmCurrentTrans * x, GlobalTransactionId gtid, cid_t global_cid)
 			id->xid = GetCurrentTransactionId();
 			id->nSubxids = 0;
 			id->subxids = 0;
+			x->xid = id->xid;
 		}
 		local_cid = dtm_sync(global_cid);
 		x->snapshot = global_cid;
@@ -535,6 +549,7 @@ DtmLocalAccess(DtmCurrentTrans * x, GlobalTransactionId gtid, cid_t global_cid)
 	{
 		elog(ERROR, "Too old snapshot: requested %ld, current %ld", global_cid, local_cid);
 	}
+	DtmInitGlobalXmin(x->xid);
 	return global_cid;
 }
 
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -3042,6 +3042,19 @@ ProcArraySetGlobalSnapshotXmin(TransactionId xmin)
 	LWLockRelease(ProcArrayLock);
 }
 
+/*
+ * ProcArrayGetGlobalSnapshotXmin
+ */
+TransactionId
+ProcArrayGetGlobalSnapshotXmin(void)
+{
+	TransactionId xmin;
+	LWLockAcquire(ProcArrayLock, LW_SHARED);
+	xmin = procArray->global_snapshot_xmin;
+	LWLockRelease(ProcArrayLock);
+	return xmin;
+}
+
 #define XidCacheRemove(i) \
 	do { \
 		MyProc->subxids.xids[i] = MyProc->subxids.xids[MyPgXact->nxids - 1]; \
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
@@ -125,5 +125,6 @@ extern void ProcArrayGetReplicationSlotXmin(TransactionId *xmin,
 								TransactionId *catalog_xmin);
 
 extern void ProcArraySetGlobalSnapshotXmin(TransactionId xmin);
+extern TransactionId ProcArrayGetGlobalSnapshotXmin(void);
 
 #endif							/* PROCARRAY_H */
