Skip to content

Commit 1dddd25

Browse files
knizhnikknizhnik
committed
2 parents 458222b + 0c48543 commit 1dddd25

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎contrib/mmts/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ OBJS = multimaster.o raftable.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o
33

44
override CPPFLAGS += -I../raftable
55

6-
SCRIPTS_built = tests/dtmbench
6+
#SCRIPTS_built = tests/dtmbench
77
EXTRA_INSTALL = contrib/raftable contrib/mmts
88

99
EXTENSION = multimaster
1010
DATA = multimaster--1.0.sql
1111

1212
.PHONY: all
1313

14-
all: multimaster.so tests/dtmbench
14+
all: multimaster.so #tests/dtmbench
1515

1616
tests/dtmbench:
1717
make -C tests

‎contrib/mmts/arbiter.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,18 @@ static int gateway;
105105
static void MtmTransSender(Datum arg);
106106
static void MtmTransReceiver(Datum arg);
107107

108-
static char const* const messageText[] =
109-
{
110-
"INVALID",
111-
"HANDSHAKE",
112-
"READY",
113-
"PREPARE",
114-
"PREPARED",
115-
"ABORTED",
116-
"STATUS"
117-
};
118-
108+
/*
109+
* static char const* const messageText[] =
110+
* {
111+
* "INVALID",
112+
* "HANDSHAKE",
113+
* "READY",
114+
* "PREPARE",
115+
* "PREPARED",
116+
* "ABORTED",
117+
* "STATUS"
118+
*};
119+
*/
119120

120121
static BackgroundWorker MtmSender = {
121122
"mtm-sender",
@@ -715,7 +716,7 @@ static void MtmTransReceiver(Datum arg)
715716
/* Coordinator's disabled mask is wider than of this node: so reject such transaction to avoid
716717
commit on smaller subset of nodes */
717718
elog(WARNING, "Coordinator of distributed transaction see less nodes than node %d: %lx instead of %lx",
718-
msg->node, Mtm->disabledNodeMask, msg->disabledNodeMask);
719+
msg->node, (long) Mtm->disabledNodeMask, (long) msg->disabledNodeMask);
719720
MtmAbortTransaction(ts);
720721
}
721722

‎contrib/mmts/multimaster.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ MtmCheckClusterLock()
11561156
} else {
11571157
/* All lockers are synchronized their logs */
11581158
/* 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);
11601160
Assert(Mtm->walSenderLockerMask == 0);
11611161
Assert((Mtm->nodeLockerMask & Mtm->disabledNodeMask) == Mtm->nodeLockerMask);
11621162
Mtm->disabledNodeMask &= ~Mtm->nodeLockerMask;
@@ -1216,7 +1216,7 @@ bool MtmRefreshClusterStatus(bool nowait)
12161216

12171217
clique = MtmFindMaxClique(matrix, MtmNodes, &clique_size);
12181218
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);
12201220
MtmLock(LW_EXCLUSIVE);
12211221
mask = ~clique & (((nodemask_t)1 << MtmNodes)-1) & ~Mtm->disabledNodeMask; /* new disabled nodes mask */
12221222
for (i = 0; mask != 0; i++, mask >>= 1) {
@@ -1244,7 +1244,7 @@ bool MtmRefreshClusterStatus(bool nowait)
12441244
MtmSwitchClusterMode(MTM_RECOVERY);
12451245
}
12461246
} else {
1247-
elog(WARNING, "Clique %lx has no quorum", clique);
1247+
elog(WARNING, "Clique %lx has no quorum", (long) clique);
12481248
MtmSwitchClusterMode(MTM_IN_MINORITY);
12491249
}
12501250
return true;
@@ -1254,12 +1254,12 @@ void MtmCheckQuorum(void)
12541254
{
12551255
if (Mtm->nNodes < MtmNodes/2+1) {
12561256
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);
12581258
MtmSwitchClusterMode(MTM_IN_MINORITY);
12591259
}
12601260
} else {
12611261
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);
12631263
MtmSwitchClusterMode(MTM_ONLINE);
12641264
}
12651265
}
@@ -2248,7 +2248,7 @@ MtmNoticeReceiver(void *i, const PGresult *res)
22482248
/* Strip "NOTICE: " from beginning and "\n" from end of error string */
22492249
strncpy(stripped_notice, notice + 9, len - 1 - 9);
22502250

2251-
elog(NOTICE, stripped_notice);
2251+
elog(NOTICE, "%s", stripped_notice);
22522252
pfree(stripped_notice);
22532253
}
22542254

@@ -2292,7 +2292,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
22922292
if (MtmGUCBufferAllocated && !MtmRunUtilityStmt(conns[i], MtmGUCBuffer->data, &utility_errmsg) && !ignoreError)
22932293
{
22942294
errorMsg = "Failed to set GUC variables at node %d";
2295-
elog(ERROR, utility_errmsg);
2295+
elog(NOTICE, "%s", utility_errmsg);
22962296
failedNode = i;
22972297
break;
22982298
}
@@ -2308,7 +2308,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
23082308
errorMsg = utility_errmsg;
23092309
else
23102310
{
2311-
elog(ERROR, utility_errmsg);
2311+
elog(ERROR, "%s", utility_errmsg);
23122312
errorMsg = "Failed to run command at node %d";
23132313
}
23142314

‎contrib/mmts/pglogical_output.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,6 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,
493493
}
494494

495495
if (!data->forward_changesets && origin_id != InvalidRepOriginId) {
496-
*(int*)0 = 0;
497496
return true;
498497
}
499498

0 commit comments

Comments
 (0)