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

kvap · kvap · commit a69772f97f23 · 2015-10-06T12:57:40.000+03:00
diff --git a/contrib/pg_dtm/pg_dtm.c b/contrib/pg_dtm/pg_dtm.c
@@ -792,7 +792,9 @@ Datum
 dtm_begin_transaction(PG_FUNCTION_ARGS)
 {
 	Assert(!TransactionIdIsValid(DtmNextXid));
-
+    if (dtm == NULL) { 
+        elog(ERROR, "DTM is not properly initialized, please check that pg_dtm plugin was added to shared_preload_libraries list in postgresql.conf");
+    }
 	DtmNextXid = DtmGlobalStartTransaction(&DtmSnapshot, &dtm->minXid);
 	Assert(TransactionIdIsValid(DtmNextXid));
 	XTM_INFO("%d: Start global transaction %d, dtm->minXid=%d\n", getpid(), DtmNextXid, dtm->minXid);
diff --git a/contrib/pg_dtm/tests/transfers.go b/contrib/pg_dtm/tests/transfers.go
@@ -218,7 +218,9 @@ func main() {
     var transferWg sync.WaitGroup
     var inspectWg sync.WaitGroup
 
+    fmt.Printf("preparing the database...\n")
     prepare_db()
+    fmt.Printf("the database prepared\n")
 
     cCommits := make(chan int)
     cAborts := make(chan int)
