@@ -716,6 +716,7 @@ static void DtmInitialize()
716716dtm -> nNodes = MMNodes ;
717717pg_atomic_write_u32 (& dtm -> nReceivers ,0 );
718718dtm -> initialized = false;
719+ dtm -> pool = BgwPoolCreate (MMExecutor ,MMDatabaseName ,MMQueueSize ,MMWorkers );
719720RegisterXactCallback (DtmXactCallback ,NULL );
720721}
721722LWLockRelease (AddinShmemInitLock );
@@ -824,14 +825,6 @@ _PG_init(void)
824825if (!process_shared_preload_libraries_in_progress )
825826return ;
826827
827- /*
828- * Request additional shared resources. (These are no-ops if we're not in
829- * the postmaster process.) We'll allocate or attach to the shared
830- * resources in imcs_shmem_startup().
831- */
832- RequestAddinShmemSpace (DTM_SHMEM_SIZE );
833- RequestAddinLWLocks (2 );
834-
835828DefineCustomIntVariable (
836829"multimaster.workers" ,
837830"Number of multimaster executor workers per node" ,
@@ -948,11 +941,18 @@ _PG_init(void)
948941NULL
949942);
950943
944+ /*
945+ * Request additional shared resources. (These are no-ops if we're not in
946+ * the postmaster process.) We'll allocate or attach to the shared
947+ * resources in dtm_shmem_startup().
948+ */
949+ RequestAddinShmemSpace (DTM_SHMEM_SIZE + MMQueueSize );
950+ RequestAddinLWLocks (2 );
951+
951952MMNodes = MMStartReceivers (MMConnStrs ,MMNodeId );
952953if (MMNodes < 2 ) {
953954elog (ERROR ,"Multimaster should have at least two nodes" );
954955 }
955- dtm -> pool = BgwPoolCreate (MMExecutor ,MMDatabaseName ,MMQueueSize ,MMWorkers );
956956
957957if (DtmBufferSize != 0 )
958958{
@@ -1189,6 +1189,7 @@ static void MMExecutor(int id, void* work, size_t size)
11891189TransactionId xid = * (TransactionId * )work ;
11901190char * stmts = (char * )work + 4 ;
11911191int rc = SPI_ERROR_TRANSACTION ;
1192+
11921193MMJoinTransaction (xid );
11931194
11941195SetCurrentStatementStartTimestamp ();