Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit 3a2142268834 · 2016-07-29T19:39:44.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1150,18 +1150,19 @@ void MtmHandleApplyError(void)
 {
 	ErrorData *edata = CopyErrorData();
 	switch (edata->sqlerrcode) { 
-	  case ERRCODE_DISK_FULL:
-	  case ERRCODE_INSUFFICIENT_RESOURCES:
-	  case ERRCODE_IO_ERROR:
-	  case ERRCODE_DATA_CORRUPTED:
-	  case ERRCODE_INDEX_CORRUPTED:
-	  case ERRCODE_SYSTEM_ERROR:
-	  case ERRCODE_INTERNAL_ERROR:
-	  case ERRCODE_OUT_OF_MEMORY:		  
-		  elog(WARNING, "Node is excluded from cluster because of non-recoverable error %d", edata->sqlerrcode);
-		  MtmSwitchClusterMode(MTM_OUT_OF_SERVICE);
-		  kill(PostmasterPid, SIGQUIT);
-		  break;
+		case ERRCODE_DISK_FULL:
+		case ERRCODE_INSUFFICIENT_RESOURCES:
+		case ERRCODE_IO_ERROR:
+		case ERRCODE_DATA_CORRUPTED:
+		case ERRCODE_INDEX_CORRUPTED:
+		case ERRCODE_SYSTEM_ERROR:
+		case ERRCODE_INTERNAL_ERROR:
+		case ERRCODE_OUT_OF_MEMORY:
+			elog(WARNING, "Node is excluded from cluster because of non-recoverable error %d, %s, pid=%u",
+				edata->sqlerrcode, edata->message, getpid());
+			MtmSwitchClusterMode(MTM_OUT_OF_SERVICE);
+			kill(PostmasterPid, SIGQUIT);
+			break;
 	}
 	FreeErrorData(edata);
 }
@@ -3182,7 +3183,8 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 			{
 				/* Do not replicate temp tables */
 				CreateStmt *stmt = (CreateStmt *) parsetree;
-				skipCommand = stmt->relation->relpersistence == RELPERSISTENCE_TEMP;
+				skipCommand = stmt->relation->relpersistence == RELPERSISTENCE_TEMP ||
+					(stmt->relation->schemaname && strcmp(stmt->relation->schemaname, "pg_temp") == 0);
 			}
 			break;
 		case T_IndexStmt:
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -701,9 +701,8 @@ process_remote_insert(StringInfo s, Relation rel)
 		MTM_LOG3("%d: Execute utility statement %s", MyProcPid, ddl);
 		rc = SPI_execute(ddl, false, 0);
         SPI_finish();
-		if (rc != SPI_OK_UTILITY) { 
+		if (rc < 0)
 			elog(ERROR, "Failed to execute utility statement %s", ddl);
-		}
 	} else if (strcmp(relname, MULTIMASTER_LOCAL_TABLES_TABLE) == 0) { 
 		char* schema = TextDatumGetCString(new_tuple.values[Anum_mtm_local_tables_rel_schema-1]);
 		char* name = TextDatumGetCString(new_tuple.values[Anum_mtm_local_tables_rel_name-1]);
