Update multimaster

knizhnik · knizhnik · commit 9a5119344834 · 2015-12-02T12:58:36.000+03:00
diff --git a/contrib/multimaster/multimaster.c b/contrib/multimaster/multimaster.c
@@ -43,6 +43,7 @@
 #include "storage/pmsignal.h"
 #include "storage/proc.h"
 #include "utils/syscache.h"
+#include "replication/walsender.h"
 #include "port/atomics.h"
 
 #include "sockhub/sockhub.h"
@@ -757,7 +758,7 @@ DtmXactCallback(XactEvent event, void *arg)
     case XACT_EVENT_START: 
       //XTM_INFO("%d: normal=%d, initialized=%d, replication=%d, bgw=%d, vacuum=%d\n", 
       //           getpid(), IsNormalProcessingMode(), dtm->initialized, MMDoReplication, IsBackgroundWorker, IsAutoVacuumWorkerProcess());
-        if (IsNormalProcessingMode() && dtm->initialized && MMDoReplication && !IsBackgroundWorker && !IsAutoVacuumWorkerProcess()) { 
+        if (IsNormalProcessingMode() && dtm->initialized && MMDoReplication && !am_walsender && !IsBackgroundWorker && !IsAutoVacuumWorkerProcess()) { 
             MMBeginTransaction();
         }
         break;
@@ -1190,7 +1191,7 @@ static void MMExecutor(int id, void* work, size_t size)
 {
     TransactionId xid = *(TransactionId*)work;
     char* stmts = (char*)work + 4;
-    int rc = SPI_ERROR_TRANSACTION;
+    bool finished = false;
 
     MMJoinTransaction(xid);
 
@@ -1201,9 +1202,10 @@ static void MMExecutor(int id, void* work, size_t size)
 
     PG_TRY();
     {
-        rc = SPI_execute(stmts, false, 0);
+        int rc = SPI_execute(stmts, false, 0);
         SPI_finish();
         PopActiveSnapshot();
+        finished = true;
         if (rc != SPI_OK_INSERT && rc != SPI_OK_UPDATE && rc != SPI_OK_DELETE) {
             ereport(LOG, (errmsg("Executor %d: failed to apply transaction %u",
                                  id, xid)));
@@ -1215,9 +1217,11 @@ static void MMExecutor(int id, void* work, size_t size)
     PG_CATCH();
     {
         FlushErrorState();
-        if (rc == SPI_ERROR_TRANSACTION) {
+        if (!finished) {
             SPI_finish();
-            PopActiveSnapshot();
+            if (ActiveSnapshotSet()) { 
+                PopActiveSnapshot();
+            }
         }
         AbortCurrentTransaction();
     }
diff --git a/contrib/multimaster/receiver_raw.c b/contrib/multimaster/receiver_raw.c
@@ -46,7 +46,7 @@ static volatile sig_atomic_t got_sigterm = false;
 static volatile sig_atomic_t got_sighup = false;
 
 /* GUC variables */
-static int receiver_idle_time = 1;
+static int receiver_idle_time = 0;/*1*/
 static bool receiver_sync_mode = false;/*true;*/
 
 /* Worker name */
diff --git a/contrib/multimaster/tests/dtmbench b/contrib/multimaster/tests/dtmbench
