Skip to content

Commit 721d04e

Browse files
committed
Cleanup logging a bit more.
1 parent de58ff4 commit 721d04e

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

multimaster--1.0.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,10 @@ CREATE FUNCTION update_recovery_horizons() returns void
248248
CREATE FUNCTION mtm.syncpoints_trigger_f() RETURNS trigger AS $$
249249
BEGIN
250250
IF (TG_OP = 'DELETE') THEN
251-
RAISE LOG 'deleting syncpoint row: %', OLD;
251+
-- RAISE LOG 'deleting syncpoint row: %', OLD;
252252
RETURN OLD;
253253
ELSE
254-
RAISE LOG 'inserting syncpoint row: %', NEW;
254+
-- RAISE LOG 'inserting syncpoint row: %', NEW;
255255
-- others info about syncpoints apply allow to advance our horizons, so
256256
-- it makes sense to update them here, not only sp apply
257257
PERFORM mtm.update_recovery_horizons();

src/commit.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ mtm_commit_cleanup(int status, Datum arg)
164164
{
165165
ereport(WARNING,
166166
(errcode(ERRCODE_TRANSACTION_RESOLUTION_UNKNOWN),
167-
errmsg("[multimaster] exiting commit sequence of transaction %s with unknown status",
167+
errmsg("exiting commit sequence of transaction %s with unknown status",
168168
mtm_commit_state.gid),
169169
errdetail("The transaction will be committed or aborted later.")));
170170

@@ -254,13 +254,13 @@ MtmBeginTransaction()
254254
if (!MtmBreakConnection)
255255
{
256256
mtm_log(ERROR,
257-
"Multimaster node is not online: current status %s",
257+
"multimaster node is not online: current status %s",
258258
MtmNodeStatusMnem[node_status]);
259259
}
260260
else
261261
{
262262
mtm_log(FATAL,
263-
"Multimaster node is not online: current status %s",
263+
"multimaster node is not online: current status %s",
264264
MtmNodeStatusMnem[node_status]);
265265
}
266266
}
@@ -511,7 +511,7 @@ MtmTwoPhaseCommit(void)
511511
MtmGeneration new_gen = MtmGetCurrentGen(false);
512512
ereport(ERROR,
513513
(errcode(ERRCODE_INTERNAL_ERROR),
514-
errmsg("[multimaster] failed to collect prepare acks due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
514+
errmsg("failed to collect prepare acks due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
515515
xact_gen.num,
516516
maskToString(xact_gen.members),
517517
new_gen.num,
@@ -525,7 +525,7 @@ MtmTwoPhaseCommit(void)
525525

526526
ereport(ERROR,
527527
(errcode(ERRCODE_CONNECTION_FAILURE),
528-
errmsg("[multimaster] failed to collect prepare acks from nodemask %s due to network error",
528+
errmsg("failed to collect prepare acks from nodemask %s due to network error",
529529
maskToString(failed_cohort))));
530530
}
531531
for (i = 0; i < n_messages; i++)
@@ -536,11 +536,11 @@ MtmTwoPhaseCommit(void)
536536
if (MtmVolksWagenMode)
537537
ereport(ERROR,
538538
(errcode(p_messages[i]->errcode),
539-
errmsg("[multimaster] failed to prepare transaction at peer node")));
539+
errmsg("failed to prepare transaction at peer node")));
540540
else
541541
ereport(ERROR,
542542
(errcode(p_messages[i]->errcode),
543-
errmsg("[multimaster] failed to prepare transaction %s at node %d",
543+
errmsg("failed to prepare transaction %s at node %d",
544544
mtm_commit_state.gid, p_messages[i]->node_id),
545545
errdetail("sqlstate %s (%s)",
546546
unpack_sql_state(p_messages[i]->errcode),
@@ -594,7 +594,7 @@ MtmTwoPhaseCommit(void)
594594
}
595595
ereport(WARNING,
596596
(errcode(ERRCODE_INTERNAL_ERROR),
597-
errmsg("[multimaster] failed to precommit transaction %s at node %d",
597+
errmsg("failed to precommit transaction %s at node %d",
598598
mtm_commit_state.gid, twoa_messages[i]->node_id),
599599
errdetail("status=%d, accepted term=<%d, %d>",
600600
twoa_messages[i]->status,
@@ -610,7 +610,7 @@ MtmTwoPhaseCommit(void)
610610
MtmGeneration new_gen = MtmGetCurrentGen(false);
611611
ereport(ERROR,
612612
(errcode(ERRCODE_INTERNAL_ERROR),
613-
errmsg("[multimaster] failed to collect precommit acks of transaction %s due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
613+
errmsg("failed to collect precommit acks of transaction %s due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
614614
mtm_commit_state.gid,
615615
xact_gen.num,
616616
maskToString(xact_gen.members),
@@ -626,7 +626,7 @@ MtmTwoPhaseCommit(void)
626626
}
627627
ereport(ERROR,
628628
(errcode(ERRCODE_INTERNAL_ERROR),
629-
errmsg("[multimaster] failed to collect precommit acks or precommit transaction %s at nodes %s due to network error or non-first term",
629+
errmsg("failed to collect precommit acks or precommit transaction %s at nodes %s due to network error or non-first term",
630630
mtm_commit_state.gid,
631631
maskToString(failed_cohort))));
632632
}
@@ -657,7 +657,7 @@ MtmTwoPhaseCommit(void)
657657
MtmGeneration new_gen = MtmGetCurrentGen(false);
658658
ereport(WARNING,
659659
(errcode(ERRCODE_INTERNAL_ERROR),
660-
errmsg("[multimaster] failed to collect commit acks of transaction %s due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
660+
errmsg("failed to collect commit acks of transaction %s due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
661661
mtm_commit_state.gid,
662662
xact_gen.num,
663663
maskToString(xact_gen.members),
@@ -673,7 +673,7 @@ MtmTwoPhaseCommit(void)
673673
}
674674
ereport(WARNING,
675675
(errcode(ERRCODE_INTERNAL_ERROR),
676-
errmsg("[multimaster] failed to collect commit acks of transaction %s at nodes %s due to network error",
676+
errmsg("failed to collect commit acks of transaction %s at nodes %s due to network error",
677677
mtm_commit_state.gid,
678678
maskToString(failed_cohort))));
679679
}
@@ -843,7 +843,7 @@ MtmExplicitPrepare(char *gid)
843843
MtmGeneration new_gen = MtmGetCurrentGen(false);
844844
ereport(ERROR,
845845
(errcode(ERRCODE_INTERNAL_ERROR),
846-
errmsg("[multimaster] failed to collect prepare acks due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
846+
errmsg("failed to collect prepare acks due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
847847
xact_gen.num,
848848
maskToString(xact_gen.members),
849849
new_gen.num,
@@ -857,7 +857,7 @@ MtmExplicitPrepare(char *gid)
857857

858858
ereport(ERROR,
859859
(errcode(ERRCODE_CONNECTION_FAILURE),
860-
errmsg("[multimaster] failed to collect prepare acks from nodemask %s due to network error",
860+
errmsg("failed to collect prepare acks from nodemask %s due to network error",
861861
maskToString(failed_cohort))));
862862
}
863863
for (i = 0; i < n_messages; i++)
@@ -866,7 +866,7 @@ MtmExplicitPrepare(char *gid)
866866
{
867867
ereport(ERROR,
868868
(errcode(p_messages[i]->errcode),
869-
errmsg("[multimaster] failed to prepare transaction %s at node %d",
869+
errmsg("failed to prepare transaction %s at node %d",
870870
mtm_commit_state.gid, p_messages[i]->node_id),
871871
errdetail("sqlstate %s (%s)",
872872
unpack_sql_state(p_messages[i]->errcode),
@@ -957,7 +957,7 @@ MtmExplicitFinishPrepared(bool isTopLevel, char *gid, bool isCommit)
957957
MtmGeneration new_gen = MtmGetCurrentGen(false);
958958
ereport(WARNING,
959959
(errcode(ERRCODE_INTERNAL_ERROR),
960-
errmsg("[multimaster] failed to collect %s acks of transaction %s due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
960+
errmsg("failed to collect %s acks of transaction %s due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
961961
isCommit ? "commit" : "abort",
962962
gid,
963963
gen.num,
@@ -974,7 +974,7 @@ MtmExplicitFinishPrepared(bool isTopLevel, char *gid, bool isCommit)
974974
}
975975
ereport(WARNING,
976976
(errcode(ERRCODE_INTERNAL_ERROR),
977-
errmsg("[multimaster] failed to collect %s acks of transaction %s at nodes %s due to network error",
977+
errmsg("failed to collect %s acks of transaction %s at nodes %s due to network error",
978978
isCommit ? "commit" : "abort",
979979
gid,
980980
maskToString(failed_cohort))));

src/dmq.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ dmq_sender_main(Datum main_arg)
893893
dmq_state->sconn_cnt[mask_pos] = sconn_cnt[mask_pos];
894894

895895
mtm_log(DmqStateFinal,
896-
"[DMQ] Connected to %s",
896+
"[DMQ] connected to %s",
897897
conns[conn_id].receiver_name);
898898

899899
dmq_sender_connect_hook(conns[conn_id].receiver_name);
@@ -1510,7 +1510,7 @@ dmq_receiver_loop(PG_FUNCTION_ARGS)
15101510
{
15111511
ereport(FATAL,
15121512
(errcode(ERRCODE_ADMIN_SHUTDOWN),
1513-
errmsg("[DMQ] exit receiver due to unexpected postmaster exit")));
1513+
errmsg("[DMQ] receiver exits due to unexpected postmaster exit")));
15141514
}
15151515

15161516
/* XXX: is it enough? */
@@ -1529,7 +1529,7 @@ dmq_receiver_loop(PG_FUNCTION_ARGS)
15291529

15301530
if (dmq_now() - last_message_at > recv_timeout)
15311531
{
1532-
mtm_log(FATAL, "[DMQ] exit receiver due to heatbeat timeout");
1532+
mtm_log(FATAL, "[DMQ] receiver exits due to heartbeat timeout");
15331533
}
15341534

15351535
}

src/pglogical_apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ process_remote_commit(StringInfo in,
946946
MemoryContextSwitchTo(MtmApplyContext);
947947
ReleasePB();
948948
rwctx->gtx->prepared = true; /* now we have WAL record */
949-
mtm_log(MtmTxTrace, "TXFINISH: %s prepared (local_xid=" XID_FMT ")", gid, xid);
949+
mtm_log(MtmTxTrace, "%s prepared (local_xid=" XID_FMT ")", gid, xid);
950950

951951
GlobalTxRelease(rwctx->gtx);
952952
rwctx->gtx = NULL;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy