Merge branch 'xtm' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into xtm

kvap · kvap · commit 402ac5c430ab · 2015-09-09T14:42:00.000+03:00
diff --git a/contrib/pg_gtm/pg_dtm.c b/contrib/pg_gtm/pg_dtm.c
@@ -90,6 +90,8 @@ static Size dtm_memsize(void);
 static void dtm_xact_callback(XactEvent event, void *arg);
 static void dtm_ensure_connection(void);
 
+static Snapshot DtmGetSnapshotData(Snapshot snapshot);
+
 /*
  *  ***************************************************************************
  */
@@ -391,7 +393,7 @@ void DtmInitialize()
 		HASH_ELEM | HASH_FUNCTION | HASH_COMPARE | HASH_KEYCOPY);
 
 	RegisterTransactionVisibilityCallback(DtmVisibilityCheck);
-    TM->GetSnapshotData = DtmGetSnapshotData;
+    TM->GetSnapshot = DtmGetSnapshotData;
 
 	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
 	local = (DtmNodeState*)ShmemInitStruct("dtm", sizeof(DtmNodeState), &found);
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -82,7 +82,9 @@ static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, Transaction
     CLOGTransactionIdSetTreeStatus(xid, nsubxids, subxids, TRANSACTION_STATUS_IN_PROGRESS, lsn); 
     DtmHasSnapshot = false;
     DtmEnsureConnection();
-    return DtmGlobalSetTransStatus(DtmConn, DtmNodeId, xid, status);
+    if (DtmGlobalSetTransStatus(DtmConn, DtmNodeId, xid, status)) { 
+        elog(ERROR, "DTMD failed to set transaction status");
+    }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,9 @@ static void DtmSetTransactionStatus(TransactionId xid, int nsubxids, Transaction`
`82`	`82`	`CLOGTransactionIdSetTreeStatus(xid, nsubxids, subxids, TRANSACTION_STATUS_IN_PROGRESS, lsn);`
`83`	`83`	`DtmHasSnapshot = false;`
`84`	`84`	`DtmEnsureConnection();`
`85`		`- return DtmGlobalSetTransStatus(DtmConn, DtmNodeId, xid, status);`
	`85`	`+ if (DtmGlobalSetTransStatus(DtmConn, DtmNodeId, xid, status)) {`
	`86`	`+ elog(ERROR, "DTMD failed to set transaction status");`
	`87`	`+ }`
`86`	`88`	`}`
`87`	`89`
`88`	`90`