Skip to content

Commit 0fec9d3

Browse files
arssherarssher
committed
Fixup 721d04e.
1 parent 7842f5e commit 0fec9d3

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎expected/regression_ee.diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ diff ../../../src/test/regress/expected/create_table.out ../tmp_check/regress_ou
55
DROP TABLE as_select1;
66
PREPARE select1 AS SELECT 1 as a;
77
CREATE TABLE as_select1 AS EXECUTE select1;
8-
+ERROR: [multimaster] failed to prepare transaction at peer node
8+
+ERROR: [MTM] failed to prepare transaction at peer node
99
CREATE TABLE as_select1 AS EXECUTE select1;
1010
-ERROR: relation "as_select1" already exists
11-
+ERROR: [multimaster] failed to prepare transaction at peer node
11+
+ERROR: [MTM] failed to prepare transaction at peer node
1212
SELECT * FROM as_select1;
1313
- a
1414
----
@@ -20,7 +20,7 @@ diff ../../../src/test/regress/expected/create_table.out ../tmp_check/regress_ou
2020
+ ^
2121
CREATE TABLE IF NOT EXISTS as_select1 AS EXECUTE select1;
2222
-NOTICE: relation "as_select1" already exists, skipping
23-
+ERROR: [multimaster] failed to prepare transaction at peer node
23+
+ERROR: [MTM] failed to prepare transaction at peer node
2424
DROP TABLE as_select1;
2525
+ERROR: table "as_select1" does not exist
2626
DEALLOCATE select1;
@@ -535,7 +535,7 @@ diff ../../../src/test/regress/expected/atx.out ../tmp_check/regress_outdir/resu
535535
RESET client_min_messages;
536536
create database regression_atx_test_database;
537537
ALTER DATABASE "regression_atx_test_database" SET lc_messages TO 'C';
538-
+ERROR: [multimaster] failed to prepare transaction at peer node
538+
+ERROR: [MTM] failed to prepare transaction at peer node
539539
\c regression_atx_test_database
540540
create table atx_test as select 1 as id;
541541
begin;
@@ -698,7 +698,7 @@ diff ../../../src/test/regress/expected/prepare.out ../tmp_check/regress_outdir/
698698
SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2
699699
ORDER BY unique1;
700700
CREATE TEMPORARY TABLE q5_prep_results AS EXECUTE q5(200, 'DTAAAA');
701-
+ERROR: [multimaster] failed to prepare transaction at peer node
701+
+ERROR: [MTM] failed to prepare transaction at peer node
702702
SELECT * FROM q5_prep_results;
703703
- unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4
704704
----------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
@@ -725,7 +725,7 @@ diff ../../../src/test/regress/expected/prepare.out ../tmp_check/regress_outdir/
725725
+ ^
726726
CREATE TEMPORARY TABLE q5_prep_nodata AS EXECUTE q5(200, 'DTAAAA')
727727
WITH NO DATA;
728-
+ERROR: [multimaster] failed to prepare transaction at peer node
728+
+ERROR: [MTM] failed to prepare transaction at peer node
729729
SELECT * FROM q5_prep_nodata;
730730
- unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4
731731
----------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------

‎src/commit.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ MtmTwoPhaseCommit(void)
427427
UserAbortTransactionBlockCompat(false);
428428
ereport(MtmBreakConnection ? FATAL : ERROR,
429429
(errcode(ERRCODE_INTERNAL_ERROR),
430-
errmsg("multimaster node is not online: current status \"%s\"",
430+
errmsg("[MTM] multimaster node is not online: current status \"%s\"",
431431
MtmNodeStatusMnem[MtmGetCurrentStatus(true, false)])));
432432
}
433433

@@ -511,7 +511,7 @@ MtmTwoPhaseCommit(void)
511511
MtmGeneration new_gen = MtmGetCurrentGen(false);
512512
ereport(ERROR,
513513
(errcode(ERRCODE_INTERNAL_ERROR),
514-
errmsg("failed to collect prepare acks due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
514+
errmsg("[MTM] 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("failed to collect prepare acks from nodemask %s due to network error",
528+
errmsg("[MTM] 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("failed to prepare transaction at peer node")));
539+
errmsg("[MTM] failed to prepare transaction at peer node")));
540540
else
541541
ereport(ERROR,
542542
(errcode(p_messages[i]->errcode),
543-
errmsg("failed to prepare transaction %s at node %d",
543+
errmsg("[MTM] 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("failed to precommit transaction %s at node %d",
597+
errmsg("[MTM] 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("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("[MTM] 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("failed to collect precommit acks or precommit transaction %s at nodes %s due to network error or non-first term",
629+
errmsg("[MTM] 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("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("[MTM] 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("failed to collect commit acks of transaction %s at nodes %s due to network error",
676+
errmsg("[MTM] 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
}
@@ -740,7 +740,7 @@ MtmExplicitPrepare(char *gid)
740740
UserAbortTransactionBlockCompat(false); /* see same call above */
741741
ereport(ERROR,
742742
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
743-
errmsg("invalid transaction identifier \"%s\": identifiers starting with \"MTM-\" are used by multimaster internally",
743+
errmsg("[MTM] invalid transaction identifier \"%s\": identifiers starting with \"MTM-\" are used by multimaster internally",
744744
gid)));
745745
}
746746

@@ -765,7 +765,7 @@ MtmExplicitPrepare(char *gid)
765765
UserAbortTransactionBlockCompat(false); /* see same call above */
766766
ereport(MtmBreakConnection ? FATAL : ERROR,
767767
(errcode(ERRCODE_INTERNAL_ERROR),
768-
errmsg("multimaster node is not online: current status \"%s\"",
768+
errmsg("[MTM] multimaster node is not online: current status \"%s\"",
769769
MtmNodeStatusMnem[MtmGetCurrentStatus(true, false)])));
770770
}
771771

@@ -843,7 +843,7 @@ MtmExplicitPrepare(char *gid)
843843
MtmGeneration new_gen = MtmGetCurrentGen(false);
844844
ereport(ERROR,
845845
(errcode(ERRCODE_INTERNAL_ERROR),
846-
errmsg("failed to collect prepare acks due to generation switch: was num=" UINT64_FORMAT ", members=%s, now num=" UINT64_FORMAT ", members=%s",
846+
errmsg("[MTM] 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("failed to collect prepare acks from nodemask %s due to network error",
860+
errmsg("[MTM] 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("failed to prepare transaction %s at node %d",
869+
errmsg("[MTM] 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),
@@ -910,7 +910,7 @@ MtmExplicitFinishPrepared(bool isTopLevel, char *gid, bool isCommit)
910910
if (gtx == NULL)
911911
ereport(ERROR,
912912
(errcode(ERRCODE_UNDEFINED_OBJECT),
913-
errmsg("prepared transaction with identifier \"%s\" does not exist",
913+
errmsg("[MTM] prepared transaction with identifier \"%s\" does not exist",
914914
gid)));
915915
PG_TRY();
916916
{
@@ -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("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("[MTM] 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("failed to collect %s acks of transaction %s at nodes %s due to network error",
977+
errmsg("[MTM] 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))));

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