Add [MTM] prefix to all multimaster messages

Author: knizhnik

arbiter.c

@@ -11,15 +11,19 @@
 #include "libpq-fe.h"
 
 #ifndef DEBUG_LEVEL
-#define  DEBUG_LEVEL 0
+#define DEBUG_LEVEL 0
 #endif
 
 #ifndef MTM_TRACE
-#define  MTM_TRACE   0
+#define MTM_TRACE   0
 #endif
 
+#define MTM_TAG "[MTM] "
+#define MTM_ELOG(level,fmt,...) elog(level, MTM_TAG fmt, ## __VA_ARGS__)
+#define MTM_ERRMSG(fmt,...)     errmsg(MTM_TAG fmt, ## __VA_ARGS__)
+
 #if DEBUG_LEVEL == 0
-#define MTM_LOG1(fmt, ...) elog(LOG, fmt, ## __VA_ARGS__) 
+#define MTM_LOG1(fmt, ...) elog(LOG, "[MTM] " fmt, ## __VA_ARGS__) 
 #define MTM_LOG2(fmt, ...) 
 #define MTM_LOG3(fmt, ...) 
 #define MTM_LOG4(fmt, ...) 
@@ -44,12 +48,11 @@
 #define MTM_TXTRACE(tx, event)
 #else
 #define MTM_TXTRACE(tx, event) \
-		fprintf(stderr, "[MTM_TXTRACE], %s, %lld, %s, %d\n", tx->gid, (long long)MtmGetSystemTime(), event, MyProcPid)
+		fprintf(stderr, MTM_TAG "%s, %lld, %s, %d\n", tx->gid, (long long)MtmGetSystemTime(), event, MyProcPid)
 #endif
 
 #define MULTIMASTER_NAME                "multimaster"
 #define MULTIMASTER_SCHEMA_NAME         "mtm"
-#define MULTIMASTER_DDL_TABLE           "ddl_log"
 #define MULTIMASTER_LOCAL_TABLES_TABLE  "local_tables"
 #define MULTIMASTER_SLOT_PATTERN        "mtm_slot_%d"
 #define MULTIMASTER_MIN_PROTO_VERSION   1

multimaster.c

@@ -154,10 +154,10 @@ find_pkey_tuple(ScanKey skey, Relation rel, Relation idxrel,
 				/* XXX: Improve handling here */
 				ereport(LOG,
 						(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-						 errmsg("concurrent update, retrying")));
+						 MTM_ERRMSG("concurrent update, retrying")));
 				goto retry;
 			default:
-				elog(ERROR, "unexpected HTSU_Result after locking: %u", res);
+				MTM_ELOG(ERROR, "unexpected HTSU_Result after locking: %u", res);
 				break;
 		}
 	}
@@ -253,7 +253,7 @@ build_index_scan_key(ScanKey skey, Relation rel, Relation idxrel, TupleData *tup
 									   BTEqualStrategyNumber);
 
 		if (!OidIsValid(operator))
-			elog(ERROR,
+			MTM_ELOG(ERROR,
 				 "could not lookup equality operator for type %u, optype %u in opfamily %u",
 				 atttype, optype, opfamily);
 
@@ -305,7 +305,7 @@ UserTableUpdateOpenIndexes(EState *estate, TupleTableSlot *slot)
 		if (recheckIndexes != NIL)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("bdr doesn't support index rechecks")));
+					 MTM_ERRMSG("bdr doesn't support index rechecks")));
 	}
 
 	/* FIXME: recheck the indexes */
@@ -359,7 +359,7 @@ process_remote_begin(StringInfo s)
 		rc = SPI_execute("RESET SESSION AUTHORIZATION; reset all;", false, 0);
 		SPI_finish();
 		if (rc < 0) { 
-			elog(ERROR, "Failed to set reset context: %d", rc);
+			MTM_ELOG(ERROR, "Failed to set reset context: %d", rc);
 		}
 	}
 
@@ -398,7 +398,7 @@ process_remote_message(StringInfo s)
 			rc = SPI_execute(messageBody, false, 0);
 			SPI_finish();
 			if (rc < 0) { 
-				elog(ERROR, "Failed to execute utility statement %s", messageBody);
+				MTM_ELOG(ERROR, "Failed to execute utility statement %s", messageBody);
 			} else { 
 				PushActiveSnapshot(GetTransactionSnapshot());
 
@@ -483,15 +483,15 @@ read_tuple_parts(StringInfo s, Relation rel, TupleData *tup)
 	action = pq_getmsgbyte(s);
 
 	if (action != 'T')
-		elog(ERROR, "expected TUPLE, got %c", action);
+		MTM_ELOG(ERROR, "expected TUPLE, got %c", action);
 
 	memset(tup->isnull, 1, sizeof(tup->isnull));
 	memset(tup->changed, 1, sizeof(tup->changed));
 
 	rnatts = pq_getmsgint(s, 2);
 
 	if (desc->natts < rnatts)
-		elog(ERROR, "tuple natts mismatch, %u vs %u", desc->natts, rnatts);
+		MTM_ELOG(ERROR, "tuple natts mismatch, %u vs %u", desc->natts, rnatts);
 
 	/* FIXME: unaligned data accesses */
 
@@ -555,7 +555,7 @@ read_tuple_parts(StringInfo s, Relation rel, TupleData *tup)
 					if (buf.len != buf.cursor)
 						ereport(ERROR,
 								(errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
-								 errmsg("incorrect binary data format")));
+								 MTM_ERRMSG("incorrect binary data format")));
 					break;
 				}
 			case 't': /* text format */
@@ -574,11 +574,11 @@ read_tuple_parts(StringInfo s, Relation rel, TupleData *tup)
 				}
 				break;
 			default:
-				elog(ERROR, "unknown column type '%c'", kind);
+				MTM_ELOG(ERROR, "unknown column type '%c'", kind);
 		}
 
 		if (att->attisdropped && !tup->isnull[i])
-			elog(ERROR, "data for dropped column");
+			MTM_ELOG(ERROR, "data for dropped column");
 	}
 }
 
@@ -703,7 +703,7 @@ process_remote_commit(StringInfo in)
 			MtmSetCurrentTransactionCSN(csn);
 			MtmSetCurrentTransactionGID(gid);
 			FinishPreparedTransaction(gid, true);
-			MTM_LOG1("Distributed transaction %s is committed", gid);
+			MTM_LOG2("Distributed transaction %s is committed", gid);
 			CommitTransactionCommand();
 			Assert(!MtmTransIsActive());
 			MtmEndSession(origin_node, true);
@@ -755,7 +755,7 @@ process_remote_insert(StringInfo s, Relation rel)
 	}
 
 	// if (rel->rd_rel->relkind != RELKIND_RELATION) // RELKIND_MATVIEW
-	// 	elog(ERROR, "unexpected relkind '%c' rel \"%s\"",
+	// 	MTM_ELOG(ERROR, "unexpected relkind '%c' rel \"%s\"",
 	// 		 rel->rd_rel->relkind, RelationGetRelationName(rel));
 
 	/* debug output */
@@ -804,7 +804,7 @@ process_remote_insert(StringInfo s, Relation rel)
 			/* TODO: Report tuple identity in log */
 			ereport(ERROR,
                     (errcode(ERRCODE_UNIQUE_VIOLATION),
-                     errmsg("Unique constraints violated by remotely INSERTed tuple"),
+                     MTM_ERRMSG("Unique constraints violated by remotely INSERTed tuple"),
                      errdetail("Cannot apply transaction because remotely INSERTed tuple conflicts with a local tuple on UNIQUE constraint and/or PRIMARY KEY")));
 		}
 		CHECK_FOR_INTERRUPTS();
@@ -851,7 +851,7 @@ process_remote_update(StringInfo s, Relation rel)
 
 	/* old key present, identifying key changed */
 	if (action != 'K' && action != 'N')
-		elog(ERROR, "expected action 'N' or 'K', got %c",
+		MTM_ELOG(ERROR, "expected action 'N' or 'K', got %c",
 			 action);
 
 	estate = create_rel_estate(rel);
@@ -871,11 +871,11 @@ process_remote_update(StringInfo s, Relation rel)
 
 	/* check for new  tuple */
 	if (action != 'N')
-		elog(ERROR, "expected action 'N', got %c",
+		MTM_ELOG(ERROR, "expected action 'N', got %c",
 			 action);
 
 	if (rel->rd_rel->relkind != RELKIND_RELATION)
-		elog(ERROR, "unexpected relkind '%c' rel \"%s\"",
+		MTM_ELOG(ERROR, "unexpected relkind '%c' rel \"%s\"",
 			 rel->rd_rel->relkind, RelationGetRelationName(rel));
 
 	/* read new tuple */
@@ -887,7 +887,7 @@ process_remote_update(StringInfo s, Relation rel)
 	idxoid = rel->rd_replidindex;
 	if (!OidIsValid(idxoid))
 	{
-		elog(ERROR, "could not find primary key for table with oid %u",
+		MTM_ELOG(ERROR, "could not find primary key for table with oid %u",
 			 RelationGetRelid(rel));
 		return;
 	}
@@ -936,7 +936,7 @@ process_remote_update(StringInfo s, Relation rel)
 	{
         ereport(ERROR,
                 (errcode(ERRCODE_NO_DATA_FOUND),
-                 errmsg("Record with specified key can not be located at this node"),
+                 MTM_ERRMSG("Record with specified key can not be located at this node"),
                  errdetail("Most likely we have DELETE-UPDATE conflict")));
 
 	}
@@ -976,7 +976,7 @@ process_remote_delete(StringInfo s, Relation rel)
 	idxoid = rel->rd_replidindex;
 	if (!OidIsValid(idxoid))
 	{
-		elog(ERROR, "could not find primary key for table with oid %u",
+		MTM_ELOG(ERROR, "could not find primary key for table with oid %u",
 			 RelationGetRelid(rel));
 		return;
 	}
@@ -985,7 +985,7 @@ process_remote_delete(StringInfo s, Relation rel)
 	idxrel = index_open(idxoid, RowExclusiveLock);
 
 	if (rel->rd_rel->relkind != RELKIND_RELATION)
-		elog(ERROR, "unexpected relkind '%c' rel \"%s\"",
+		MTM_ELOG(ERROR, "unexpected relkind '%c' rel \"%s\"",
 			 rel->rd_rel->relkind, RelationGetRelationName(rel));
 
 #ifdef VERBOSE_DELETE
@@ -1013,7 +1013,7 @@ process_remote_delete(StringInfo s, Relation rel)
 	{
         ereport(ERROR,
                 (errcode(ERRCODE_NO_DATA_FOUND),
-                 errmsg("Record with specified key can not be located at this node"),
+                 MTM_ERRMSG("Record with specified key can not be located at this node"),
                  errdetail("Most likely we have DELETE-DELETE conflict")));
 	}
 
@@ -1127,7 +1127,7 @@ void MtmExecutor(void* work, size_t size)
 				break;
 			}
             default:
-                elog(ERROR, "unknown action of type %c", action);
+                MTM_ELOG(ERROR, "unknown action of type %c", action);
             }        
             break;
         }

multimaster.h

@@ -32,6 +32,8 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
+#include "multimaster.h"
+
 typedef enum PGLogicalOutputParamType
 {
 	OUTPUT_PARAM_TYPE_BOOL,
@@ -253,7 +255,7 @@ process_parameters_v1(List *options, PGLogicalOutputData *data)
 
 			case PARAM_UNRECOGNISED:
 				ereport(DEBUG1,
-						(errmsg("Unrecognised pglogical parameter %s ignored", elem->defname)));
+						(MTM_ERRMSG("Unrecognised pglogical parameter %s ignored", elem->defname)));
 				break;
 		}
 	}
@@ -298,7 +300,7 @@ get_param_value(DefElem *elem, bool null_ok, PGLogicalOutputParamType type)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("parameter \"%s\" cannot be NULL", elem->defname)));
+					 MTM_ERRMSG("parameter \"%s\" cannot be NULL", elem->defname)));
 	}
 
 	switch (type)
@@ -348,7 +350,7 @@ get_param(List *options, const char *name, bool missing_ok, bool null_ok,
 	if (!missing_ok)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("missing required parameter \"%s\"", name)));
+				 MTM_ERRMSG("missing required parameter \"%s\"", name)));
 
 	return (Datum) 0;
 }
@@ -361,7 +363,7 @@ parse_param_bool(DefElem *elem)
 	if (!parse_bool(strVal(elem->arg), &res))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("could not parse boolean value \"%s\" for parameter \"%s\"",
+				 MTM_ERRMSG("could not parse boolean value \"%s\" for parameter \"%s\"",
 						strVal(elem->arg), elem->defname)));
 
 	return res;
@@ -375,13 +377,13 @@ parse_param_uint32(DefElem *elem)
 	if (!scanint8(strVal(elem->arg), true, &res))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("could not parse integer value \"%s\" for parameter \"%s\"",
+				 MTM_ERRMSG("could not parse integer value \"%s\" for parameter \"%s\"",
 						strVal(elem->arg), elem->defname)));
 
 	if (res > PG_UINT32_MAX || res < 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("value \"%s\" out of range for parameter \"%s\"",
+				 MTM_ERRMSG("value \"%s\" out of range for parameter \"%s\"",
 						strVal(elem->arg), elem->defname)));
 
 	return (uint32) res;

pglogical_apply.c

@@ -17,6 +17,8 @@
 #include "pglogical_hooks.h"
 #include "pglogical_output.h"
 
+#include "multimaster.h"
+
 /*
  * Returns Oid of the hooks function specified in funcname.
  *
@@ -39,15 +41,15 @@ get_hooks_function_oid(List *funcname)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("function %s must return void",
+				 MTM_ERRMSG("function %s must return void",
 						NameListToString(funcname))));
 	}
 
 	if (func_volatile(funcid) == PROVOLATILE_VOLATILE)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("function %s must not be VOLATILE",
+				 MTM_ERRMSG("function %s must not be VOLATILE",
 						NameListToString(funcname))));
 	}
 
@@ -61,7 +63,7 @@ get_hooks_function_oid(List *funcname)
 #endif
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("current user %s does not have permission to call function %s",
+				 MTM_ERRMSG("current user %s does not have permission to call function %s",
 					 username, NameListToString(funcname))));
 	}