Do not set XMAX_INVALID for transaction which are in progress

knizhnik · knizhnik · commit 37a2e5806c56 · 2016-10-05T17:34:05.000+03:00
diff --git a/contrib/mmts/multimaster--1.0.sql b/contrib/mmts/multimaster--1.0.sql
@@ -13,7 +13,7 @@ CREATE FUNCTION mtm.drop_node(node integer, drop_slot bool default false) RETURN
 AS 'MODULE_PATHNAME','mtm_drop_node'
 LANGUAGE C;
 
-CREATE FUNCTION mtm.add_node(conn_str cstring) RETURNS void
+CREATE FUNCTION mtm.add_node(conn_str text) RETURNS void
 AS 'MODULE_PATHNAME','mtm_add_node'
 LANGUAGE C;
 
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -62,6 +62,7 @@
 #include "pglogical_output/hooks.h"
 #include "parser/analyze.h"
 #include "parser/parse_relation.h"
+#include "tcop/pquery.h"
 
 #include "multimaster.h"
 #include "ddd.h"
@@ -150,7 +151,7 @@ static void MtmShmemStartup(void);
 static BgwPool* MtmPoolConstructor(void);
 static bool MtmRunUtilityStmt(PGconn* conn, char const* sql, char **errmsg);
 static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError);
-static bool MtmProcessDDLCommand(char const* queryString);
+static bool MtmProcessDDLCommand(char const* queryString, bool transactional);
 
 MtmState* Mtm;
 
@@ -3022,7 +3023,7 @@ mtm_drop_node(PG_FUNCTION_ARGS)
 Datum
 mtm_add_node(PG_FUNCTION_ARGS)
 {
-	char* connStr = PG_GETARG_CSTRING(0);
+	char *connStr = text_to_cstring(PG_GETARG_TEXT_PP(0));
 
 	if (Mtm->nAllNodes == MtmMaxNodes) { 
 		elog(ERROR, "Maximal number of nodes %d is reached", MtmMaxNodes);
@@ -3729,7 +3730,7 @@ static char * MtmGucSerialize(void)
  * -------------------------------------------
  */
 
-static bool MtmProcessDDLCommand(char const* queryString)
+static bool MtmProcessDDLCommand(char const* queryString, bool transactional)
 {
 	char	   *queryWithContext;
 	char	   *gucContext;
@@ -3748,7 +3749,12 @@ static bool MtmProcessDDLCommand(char const* queryString)
 	}
 
 	MTM_LOG1("Sending utility: %s", queryWithContext);
-	LogLogicalMessage("G", queryWithContext, strlen(queryWithContext)+1, true);
+	if (transactional)
+		/* DDL */
+		LogLogicalMessage("D", queryWithContext, strlen(queryWithContext) + 1, true);
+	else
+		/* CONCURRENT DDL */
+		LogLogicalMessage("C", queryWithContext, strlen(queryWithContext) + 1, false);
 
 	MtmTx.containsDML = true;
 	return false;
@@ -3785,17 +3791,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 	MTM_LOG3("%d: Process utility statement %s", MyProcPid, queryString);
 	switch (nodeTag(parsetree))
 	{
-	    case T_IndexStmt:
-		    {
-				IndexStmt* stmt = (IndexStmt*) parsetree;
-				if (stmt->concurrent) { 
-					stmt->concurrent = false;
-					elog(WARNING, "Disable concurrent option for index creation");
-				}
-				break;
-			}
-
-	    case T_TransactionStmt:
+		case T_TransactionStmt:
 			{
 				TransactionStmt *stmt = (TransactionStmt *) parsetree;
 				switch (stmt->kind)
@@ -3893,6 +3889,30 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 			}
 			break;
 
+		case T_IndexStmt:
+			{
+				IndexStmt *indexStmt = (IndexStmt *) parsetree;
+				if (indexStmt->concurrent && !IsTransactionBlock())
+				{
+					skipCommand = true;
+					MtmProcessDDLCommand(queryString, false);
+					MtmTx.isDistributed = false;
+				}
+			}
+			break;
+
+		case T_DropStmt:
+			{
+				DropStmt *stmt = (DropStmt *) parsetree;
+				if (stmt->removeType == OBJECT_INDEX && stmt->concurrent && !IsTransactionBlock())
+				{
+					skipCommand = true;
+					MtmProcessDDLCommand(queryString, false);
+					MtmTx.isDistributed = false;
+				}
+			}
+			break;
+
 		/* Copy need some special care */
 	    case T_CopyStmt:
 		{
@@ -3926,13 +3946,15 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 	if (!skipCommand && (context == PROCESS_UTILITY_TOPLEVEL || MtmUtilityProcessedInXid != GetCurrentTransactionId()))
 		MtmUtilityProcessedInXid = InvalidTransactionId;
 
-	if (context == PROCESS_UTILITY_TOPLEVEL || context == PROCESS_UTILITY_QUERY)
-	{
-		if (!skipCommand && !MtmTx.isReplicated && (MtmUtilityProcessedInXid == InvalidTransactionId)) {
-			MtmUtilityProcessedInXid = GetCurrentTransactionId();
-			MtmProcessDDLCommand(queryString);
-			executed = true;
-		}
+	if (!skipCommand && !MtmTx.isReplicated && (MtmUtilityProcessedInXid == InvalidTransactionId)) {
+		MtmUtilityProcessedInXid = GetCurrentTransactionId();
+
+		if (context == PROCESS_UTILITY_TOPLEVEL)
+			MtmProcessDDLCommand(queryString, true);
+		else
+			MtmProcessDDLCommand(ActivePortal->sourceText, true);
+
+		executed = true;
 	}
 
 	if (PreviousProcessUtilityHook != NULL)
@@ -3945,19 +3967,18 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		standard_ProcessUtility(parsetree, queryString, context,
 								params, dest, completionTag);
 	}
-	
     if (!MtmVolksWagenMode && MtmTx.isDistributed && XactIsoLevel != XACT_REPEATABLE_READ) { 
 		elog(ERROR, "Isolation level %s is not supported by multimaster", isoLevelStr[XactIsoLevel]);
 	}
-	
+
 	if (MyXactAccessedTempRel)
 	{
 		MTM_LOG1("Xact accessed temp table, stopping replication");
 		MtmTx.isDistributed = false; /* Skip */
 		MtmTx.snapshot = INVALID_CSN;
 	}
 
-	if (executed)
+	if (executed && !skipCommand)
 	{
 		MtmFinishDDLCommand();
 	}
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -70,7 +70,6 @@ static void UserTableUpdateOpenIndexes(EState *estate, TupleTableSlot *slot);
 static void UserTableUpdateIndexes(EState *estate, TupleTableSlot *slot);
 
 static bool process_remote_begin(StringInfo s);
-static void process_remote_transactional_message(StringInfo s);
 static void process_remote_message(StringInfo s);
 static void process_remote_commit(StringInfo s);
 static void process_remote_insert(StringInfo s, Relation rel);
@@ -355,35 +354,43 @@ process_remote_begin(StringInfo s)
 }
 
 static void
-process_remote_transactional_message(StringInfo s)
+process_remote_message(StringInfo s)
 {
-	int rc;
+	char action = pq_getmsgbyte(s);
 	int messageSize = pq_getmsgint(s, 4);
-	char const* stmt = pq_getmsgbytes(s, messageSize);
+	char const* messageBody = pq_getmsgbytes(s, messageSize);
 	
-	MTM_LOG1("%d: Executing utility statement %s", MyProcPid, stmt);
-	SPI_connect();	
-	ActivePortal->sourceText = stmt;
-	rc = SPI_execute(stmt, false, 0);
-	SPI_finish();
-	if (rc < 0)
-		elog(ERROR, "Failed to execute utility statement %s", stmt);
+	switch (action)
+	{
+		case 'C':
+		{
+			MTM_LOG1("%d: Executing non-tx utility statement %s", MyProcPid, messageBody);
+			SetCurrentStatementStartTimestamp();
+			StartTransactionCommand();
+			/* intentional falldown to the next case */
+		}
+		case 'D':
+		{
+			int rc;
+
+			MTM_LOG1("%d: Executing utility statement %s", MyProcPid, messageBody);
+			SPI_connect();
+			ActivePortal->sourceText = messageBody;
+			rc = SPI_execute(messageBody, false, 0);
+			SPI_finish();
+			if (rc < 0)
+				elog(ERROR, "Failed to execute utility statement %s", messageBody);
+			break;
+		}
+		case 'L':
+		{
+			MTM_LOG3("%ld: Process deadlock message with size %d from %d", MtmGetSystemTime(), messageSize, MtmReplicationNodeId);
+			MtmUpdateLockGraph(MtmReplicationNodeId, messageBody, messageSize);
+			break;
+		}
+	}
 	
-	//XXX: create messages for tables localization too.
-	// 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]);
-	// 	MtmMakeTableLocal(schema, name);
-	// }
-}	
 
-static void
-process_remote_message(StringInfo s)
-{
-	int messageSize = pq_getmsgint(s, 4);
-	char const* messageBody = pq_getmsgbytes(s, messageSize);
-	MTM_LOG3("%ld: Process deadlock message with size %d from %d", MtmGetSystemTime(), messageSize, MtmReplicationNodeId);
-	MtmUpdateLockGraph(MtmReplicationNodeId, messageBody, messageSize);
 }
 	
 static void
@@ -1049,16 +1056,10 @@ void MtmExecutor(void* work, size_t size)
 				s.len = save_len;
 				continue;
 			}
-			case 'G':
-			case 'E':
-			{
-				process_remote_transactional_message(&s);
-				continue;
-			}
-			case 'L':
+			case 'M':
 			{
 				process_remote_message(&s);
-				break;
+				continue;
 			}
             default:
                 elog(ERROR, "unknown action of type %c", action);
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -137,7 +137,7 @@ pglogical_write_message(StringInfo out,
 	{
 		MTM_LOG1("Send deadlock message to node %d", MtmReplicationNodeId);
 	}
-	else if (*prefix == 'G')
+	else if (*prefix == 'D')
 	{
 		if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN)
 		{
@@ -149,8 +149,14 @@ pglogical_write_message(StringInfo out,
 	else if (*prefix == 'E')
 	{
 		DDLInProress = false;
+		/*
+		 * we use End message only as indicator of DDL transaction finish,
+		 * so no need to send that to replicas.
+		 */
+		return;
 	}
 
+	pq_sendbyte(out, 'M');
 	pq_sendbyte(out, *prefix);
 	pq_sendint(out, sz, 4);
 	pq_sendbytes(out, message, sz);

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ pglogical_write_message(StringInfo out,`
`137`	`137`	`{`
`138`	`138`	`MTM_LOG1("Send deadlock message to node %d", MtmReplicationNodeId);`
`139`	`139`	`}`
`140`		`- else if (*prefix == 'G')`
	`140`	`+ else if (*prefix == 'D')`
`141`	`141`	`{`
`142`	`142`	`if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN)`
`143`	`143`	`{`
`@@ -149,8 +149,14 @@ pglogical_write_message(StringInfo out,`
`149`	`149`	`else if (*prefix == 'E')`
`150`	`150`	`{`
`151`	`151`	`DDLInProress = false;`
	`152`	`+ /*`
	`153`	`+ * we use End message only as indicator of DDL transaction finish,`
	`154`	`+ * so no need to send that to replicas.`
	`155`	`+ */`
	`156`	`+ return;`
`152`	`157`	`}`
`153`	`158`
	`159`	`+ pq_sendbyte(out, 'M');`
`154`	`160`	`pq_sendbyte(out, *prefix);`
`155`	`161`	`pq_sendint(out, sz, 4);`
`156`	`162`	`pq_sendbytes(out, message, sz);`