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

knizhnik · knizhnik · commit 1dddd25ee3d7 · 2016-04-08T19:11:17.000+03:00
diff --git a/contrib/mmts/Makefile b/contrib/mmts/Makefile
@@ -3,15 +3,15 @@ OBJS = multimaster.o raftable.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o
 
 override CPPFLAGS += -I../raftable
 
-SCRIPTS_built = tests/dtmbench
+#SCRIPTS_built = tests/dtmbench
 EXTRA_INSTALL = contrib/raftable contrib/mmts
 
 EXTENSION = multimaster
 DATA = multimaster--1.0.sql
 
 .PHONY: all
 
-all: multimaster.so tests/dtmbench
+all: multimaster.so #tests/dtmbench
 
 tests/dtmbench:
 	make -C tests
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -105,17 +105,18 @@ static int       gateway;
 static void MtmTransSender(Datum arg);
 static void MtmTransReceiver(Datum arg);
 
-static char const* const messageText[] = 
-{
-	"INVALID",
-	"HANDSHAKE",
-	"READY",
-	"PREPARE",
-	"PREPARED",
-	"ABORTED",
-	"STATUS"
-};
-
+/*
+ * static char const* const messageText[] = 
+ * {
+ *	"INVALID",
+ *	"HANDSHAKE",
+ *	"READY",
+ *	"PREPARE",
+ *	"PREPARED",
+ *	"ABORTED",
+ *	"STATUS"
+ *};
+ */
 
 static BackgroundWorker MtmSender = {
 	"mtm-sender",
@@ -715,7 +716,7 @@ static void MtmTransReceiver(Datum arg)
 								/* Coordinator's disabled mask is wider than of this node: so reject such transaction to avoid 
 								   commit on smaller subset of nodes */
 								elog(WARNING, "Coordinator of distributed transaction see less nodes than node %d: %lx instead of %lx",
-									 msg->node, Mtm->disabledNodeMask, msg->disabledNodeMask);
+									 msg->node, (long) Mtm->disabledNodeMask, (long) msg->disabledNodeMask);
 								MtmAbortTransaction(ts);
 							}
 
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1156,7 +1156,7 @@ MtmCheckClusterLock()
 			} else {  
 				/* All lockers are synchronized their logs */
 				/* Remove lock and mark them as receovered */
-				elog(WARNING, "Complete recovery of %d nodes (node mask %lx)", Mtm->nLockers, Mtm->nodeLockerMask);
+				elog(WARNING, "Complete recovery of %d nodes (node mask %lx)", Mtm->nLockers, (long) Mtm->nodeLockerMask);
 				Assert(Mtm->walSenderLockerMask == 0);
 				Assert((Mtm->nodeLockerMask & Mtm->disabledNodeMask) == Mtm->nodeLockerMask);
 				Mtm->disabledNodeMask &= ~Mtm->nodeLockerMask;
@@ -1216,7 +1216,7 @@ bool MtmRefreshClusterStatus(bool nowait)
 
 	clique = MtmFindMaxClique(matrix, MtmNodes, &clique_size);
 	if (clique_size >= MtmNodes/2+1) { /* have quorum */
-		elog(WARNING, "Find clique %lx, disabledNodeMask %lx", clique, Mtm->disabledNodeMask);
+		elog(WARNING, "Find clique %lx, disabledNodeMask %lx", (long) clique, (long) Mtm->disabledNodeMask);
 		MtmLock(LW_EXCLUSIVE);
 		mask = ~clique & (((nodemask_t)1 << MtmNodes)-1) & ~Mtm->disabledNodeMask; /* new disabled nodes mask */
 		for (i = 0; mask != 0; i++, mask >>= 1) {
@@ -1244,7 +1244,7 @@ bool MtmRefreshClusterStatus(bool nowait)
 			MtmSwitchClusterMode(MTM_RECOVERY);
 		}
 	} else { 
-		elog(WARNING, "Clique %lx has no quorum", clique);
+		elog(WARNING, "Clique %lx has no quorum", (long) clique);
 		MtmSwitchClusterMode(MTM_IN_MINORITY);
 	}
 	return true;
@@ -1254,12 +1254,12 @@ void MtmCheckQuorum(void)
 {
 	if (Mtm->nNodes < MtmNodes/2+1) {
 		if (Mtm->status == MTM_ONLINE) { /* out of quorum */
-			elog(WARNING, "Node is in minority: disabled mask %lx", Mtm->disabledNodeMask);
+			elog(WARNING, "Node is in minority: disabled mask %lx", (long) Mtm->disabledNodeMask);
 			MtmSwitchClusterMode(MTM_IN_MINORITY);
 		}
 	} else {
 		if (Mtm->status == MTM_IN_MINORITY) { 
-			elog(WARNING, "Node is in majority: dissbled mask %lx", Mtm->disabledNodeMask);
+			elog(WARNING, "Node is in majority: dissbled mask %lx", (long) Mtm->disabledNodeMask);
 			MtmSwitchClusterMode(MTM_ONLINE);
 		}
 	}
@@ -2248,7 +2248,7 @@ MtmNoticeReceiver(void *i, const PGresult *res)
 	/* Strip "NOTICE:  " from beginning and "\n" from end of error string */
 	strncpy(stripped_notice, notice + 9, len - 1 - 9);
 
-	elog(NOTICE, stripped_notice);
+	elog(NOTICE, "%s", stripped_notice);
 	pfree(stripped_notice);
 }
 
@@ -2292,7 +2292,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 			if (MtmGUCBufferAllocated && !MtmRunUtilityStmt(conns[i], MtmGUCBuffer->data, &utility_errmsg) && !ignoreError)
 			{
 				errorMsg = "Failed to set GUC variables at node %d";
-				elog(ERROR, utility_errmsg);
+				elog(NOTICE, "%s", utility_errmsg);
 				failedNode = i;
 				break;
 			}
@@ -2308,7 +2308,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 					errorMsg = utility_errmsg;
 				else
 				{
-					elog(ERROR, utility_errmsg);
+					elog(ERROR, "%s", utility_errmsg);
 					errorMsg = "Failed to run command at node %d";
 				}
 
diff --git a/contrib/mmts/pglogical_output.c b/contrib/mmts/pglogical_output.c
@@ -493,7 +493,6 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,
 	}
 
 	if (!data->forward_changesets && origin_id != InvalidRepOriginId) {
-		*(int*)0 = 0;
 		return true;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1156,7 +1156,7 @@ MtmCheckClusterLock()`
`1156`	`1156`	`} else {`
`1157`	`1157`	`/* All lockers are synchronized their logs */`
`1158`	`1158`	`/* Remove lock and mark them as receovered */`
`1159`		`- elog(WARNING, "Complete recovery of %d nodes (node mask %lx)", Mtm->nLockers, Mtm->nodeLockerMask);`
	`1159`	`+ elog(WARNING, "Complete recovery of %d nodes (node mask %lx)", Mtm->nLockers, (long) Mtm->nodeLockerMask);`
`1160`	`1160`	`Assert(Mtm->walSenderLockerMask == 0);`
`1161`	`1161`	`Assert((Mtm->nodeLockerMask & Mtm->disabledNodeMask) == Mtm->nodeLockerMask);`
`1162`	`1162`	`Mtm->disabledNodeMask &= ~Mtm->nodeLockerMask;`
`@@ -1216,7 +1216,7 @@ bool MtmRefreshClusterStatus(bool nowait)`
`1216`	`1216`
`1217`	`1217`	`clique = MtmFindMaxClique(matrix, MtmNodes, &clique_size);`
`1218`	`1218`	`if (clique_size >= MtmNodes/2+1) { /* have quorum */`
`1219`		`- elog(WARNING, "Find clique %lx, disabledNodeMask %lx", clique, Mtm->disabledNodeMask);`
	`1219`	`+ elog(WARNING, "Find clique %lx, disabledNodeMask %lx", (long) clique, (long) Mtm->disabledNodeMask);`
`1220`	`1220`	`MtmLock(LW_EXCLUSIVE);`
`1221`	`1221`	`mask = ~clique & (((nodemask_t)1 << MtmNodes)-1) & ~Mtm->disabledNodeMask; /* new disabled nodes mask */`
`1222`	`1222`	`for (i = 0; mask != 0; i++, mask >>= 1) {`
`@@ -1244,7 +1244,7 @@ bool MtmRefreshClusterStatus(bool nowait)`
`1244`	`1244`	`MtmSwitchClusterMode(MTM_RECOVERY);`
`1245`	`1245`	`}`
`1246`	`1246`	`} else {`
`1247`		`- elog(WARNING, "Clique %lx has no quorum", clique);`
	`1247`	`+ elog(WARNING, "Clique %lx has no quorum", (long) clique);`
`1248`	`1248`	`MtmSwitchClusterMode(MTM_IN_MINORITY);`
`1249`	`1249`	`}`
`1250`	`1250`	`return true;`
`@@ -1254,12 +1254,12 @@ void MtmCheckQuorum(void)`
`1254`	`1254`	`{`
`1255`	`1255`	`if (Mtm->nNodes < MtmNodes/2+1) {`
`1256`	`1256`	`if (Mtm->status == MTM_ONLINE) { /* out of quorum */`
`1257`		`- elog(WARNING, "Node is in minority: disabled mask %lx", Mtm->disabledNodeMask);`
	`1257`	`+ elog(WARNING, "Node is in minority: disabled mask %lx", (long) Mtm->disabledNodeMask);`
`1258`	`1258`	`MtmSwitchClusterMode(MTM_IN_MINORITY);`
`1259`	`1259`	`}`
`1260`	`1260`	`} else {`
`1261`	`1261`	`if (Mtm->status == MTM_IN_MINORITY) {`
`1262`		`- elog(WARNING, "Node is in majority: dissbled mask %lx", Mtm->disabledNodeMask);`
	`1262`	`+ elog(WARNING, "Node is in majority: dissbled mask %lx", (long) Mtm->disabledNodeMask);`
`1263`	`1263`	`MtmSwitchClusterMode(MTM_ONLINE);`
`1264`	`1264`	`}`
`1265`	`1265`	`}`
`@@ -2248,7 +2248,7 @@ MtmNoticeReceiver(void i, const PGresult res)`
`2248`	`2248`	`/* Strip "NOTICE: " from beginning and "\n" from end of error string */`
`2249`	`2249`	`strncpy(stripped_notice, notice + 9, len - 1 - 9);`
`2250`	`2250`
`2251`		`- elog(NOTICE, stripped_notice);`
	`2251`	`+ elog(NOTICE, "%s", stripped_notice);`
`2252`	`2252`	`pfree(stripped_notice);`
`2253`	`2253`	`}`
`2254`	`2254`
`@@ -2292,7 +2292,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)`
`2292`	`2292`	`if (MtmGUCBufferAllocated && !MtmRunUtilityStmt(conns[i], MtmGUCBuffer->data, &utility_errmsg) && !ignoreError)`
`2293`	`2293`	`{`
`2294`	`2294`	`errorMsg = "Failed to set GUC variables at node %d";`
`2295`		`- elog(ERROR, utility_errmsg);`
	`2295`	`+ elog(NOTICE, "%s", utility_errmsg);`
`2296`	`2296`	`failedNode = i;`
`2297`	`2297`	`break;`
`2298`	`2298`	`}`
`@@ -2308,7 +2308,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)`
`2308`	`2308`	`errorMsg = utility_errmsg;`
`2309`	`2309`	`else`
`2310`	`2310`	`{`
`2311`		`- elog(ERROR, utility_errmsg);`
	`2311`	`+ elog(ERROR, "%s", utility_errmsg);`
`2312`	`2312`	`errorMsg = "Failed to run command at node %d";`
`2313`	`2313`	`}`
`2314`	`2314`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,6 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`if (!data->forward_changesets && origin_id != InvalidRepOriginId) {`
`496`		`- (int)0 = 0;`
`497`	`496`	`return true;`
`498`	`497`	`}`
`499`	`498`