Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6b61955

Browse files
committed
Code review for transaction commit timestamps
There are three main changes here:1. No longer cause a start failure in a standby if the feature isdisabled in postgresql.conf but enabled in the master. This reverts onepart of commit4f3924d; what we keep is the ability of the standbyto activate/deactivate the module (which includes creating and removingsegments as appropriate) during replay of such actions in the master.2. Replay WAL records affecting commitTS even if the feature isdisabled. This means the standby will always have the same state as themaster after replay.3. Have COMMIT PREPARE record the transaction commit time as well. Wewere previously only applying it in the normal transaction commit path.Author: Petr JelínekDiscussion:http://www.postgresql.org/message-id/CAHGQGwHereDzzzmfxEBYcVQu3oZv6vZcgu1TPeERWbDc+gQ06g@mail.gmail.comDiscussion:http://www.postgresql.org/message-id/CAHGQGwFuzfO4JscM9LCAmCDCxp_MfLvN4QdB+xWsS-FijbjTYQ@mail.gmail.comAdditionally, I cleaned up nearby code related to replication origins,which I found a bit hard to follow, and fixed a couple of typos.Backpatch to 9.5, where this code was introduced.Per bug reports from Fujii Masao and subsequent discussion.
1 parentb631a46 commit6b61955

File tree

6 files changed

+90
-48
lines changed

6 files changed

+90
-48
lines changed

‎src/backend/access/rmgrdesc/xlogdesc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ xlog_desc(StringInfo buf, XLogReaderState *record)
111111
appendStringInfo(buf,"max_connections=%d max_worker_processes=%d "
112112
"max_prepared_xacts=%d max_locks_per_xact=%d "
113113
"wal_level=%s wal_log_hints=%s "
114-
"track_commit_timestamps=%s",
114+
"track_commit_timestamp=%s",
115115
xlrec.MaxConnections,
116116
xlrec.max_worker_processes,
117117
xlrec.max_prepared_xacts,

‎src/backend/access/transam/commit_ts.c

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,29 +122,39 @@ static void WriteSetTimestampXlogRec(TransactionId mainxid, int nsubxids,
122122
* subtrans implementation changes in the future, we might want to revisit the
123123
* decision of storing timestamp info for each subxid.
124124
*
125-
* The do_xlog parameter tells us whether to include an XLog record of this
126-
* or not. Normal path through RecordTransactionCommit() will be related
127-
* to a transaction commit XLog record, and so should pass "false" here.
128-
* Other callers probably want to pass true, so that the given values persist
129-
* in case of crashes.
125+
* The replaying_xlog parameter indicates whether the module should execute
126+
* its write even if the feature is nominally disabled, because we're replaying
127+
* a record generated from a master where the feature is enabled.
128+
*
129+
* The write_xlog parameter tells us whether to include an XLog record of this
130+
* or not. Normally, this is called from transaction commit routines (both
131+
* normal and prepared) and the information will be stored in the transaction
132+
* commit XLog record, and so they should pass "false" for this. The XLog redo
133+
* code should use "false" here as well. Other callers probably want to pass
134+
* true, so that the given values persist in case of crashes.
130135
*/
131136
void
132137
TransactionTreeSetCommitTsData(TransactionIdxid,intnsubxids,
133138
TransactionId*subxids,TimestampTztimestamp,
134-
RepOriginIdnodeid,booldo_xlog)
139+
RepOriginIdnodeid,
140+
boolreplaying_xlog,boolwrite_xlog)
135141
{
136142
inti;
137143
TransactionIdheadxid;
138144
TransactionIdnewestXact;
139145

140-
if (!track_commit_timestamp)
146+
/* We'd better not try to write xlog during replay */
147+
Assert(!(write_xlog&&replaying_xlog));
148+
149+
/* No-op if feature not enabled, unless replaying WAL */
150+
if (!track_commit_timestamp&& !replaying_xlog)
141151
return;
142152

143153
/*
144154
* Comply with the WAL-before-data rule: if caller specified it wants this
145155
* value to be recorded in WAL, do so before touching the data.
146156
*/
147-
if (do_xlog)
157+
if (write_xlog)
148158
WriteSetTimestampXlogRec(xid,nsubxids,subxids,timestamp,nodeid);
149159

150160
/*
@@ -906,7 +916,8 @@ commit_ts_redo(XLogReaderState *record)
906916
subxids=NULL;
907917

908918
TransactionTreeSetCommitTsData(setts->mainxid,nsubxids,subxids,
909-
setts->timestamp,setts->nodeid, false);
919+
setts->timestamp,setts->nodeid, false,
920+
true);
910921
if (subxids)
911922
pfree(subxids);
912923
}

‎src/backend/access/transam/twophase.c

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include<time.h>
4242
#include<unistd.h>
4343

44+
#include"access/commit_ts.h"
4445
#include"access/htup_details.h"
4546
#include"access/subtrans.h"
4647
#include"access/transam.h"
@@ -56,8 +57,9 @@
5657
#include"miscadmin.h"
5758
#include"pg_trace.h"
5859
#include"pgstat.h"
59-
#include"replication/walsender.h"
60+
#include"replication/origin.h"
6061
#include"replication/syncrep.h"
62+
#include"replication/walsender.h"
6163
#include"storage/fd.h"
6264
#include"storage/ipc.h"
6365
#include"storage/predicate.h"
@@ -2070,8 +2072,9 @@ RecoverPreparedTransactions(void)
20702072
/*
20712073
*RecordTransactionCommitPrepared
20722074
*
2073-
* This is basically the same as RecordTransactionCommit: in particular,
2074-
* we must set the delayChkpt flag to avoid a race condition.
2075+
* This is basically the same as RecordTransactionCommit (q.v. if you change
2076+
* this function): in particular, we must set the delayChkpt flag to avoid a
2077+
* race condition.
20752078
*
20762079
* We know the transaction made at least one XLOG entry (its PREPARE),
20772080
* so it is never possible to optimize out the commit record.
@@ -2087,19 +2090,49 @@ RecordTransactionCommitPrepared(TransactionId xid,
20872090
boolinitfileinval)
20882091
{
20892092
XLogRecPtrrecptr;
2093+
TimestampTzcommitts=GetCurrentTimestamp();
2094+
boolreplorigin;
2095+
2096+
/*
2097+
* Are we using the replication origins feature? Or, in other words, are
2098+
* we replaying remote actions?
2099+
*/
2100+
replorigin= (replorigin_session_origin!=InvalidRepOriginId&&
2101+
replorigin_session_origin!=DoNotReplicateId);
20902102

20912103
START_CRIT_SECTION();
20922104

20932105
/* See notes in RecordTransactionCommit */
20942106
MyPgXact->delayChkpt= true;
20952107

20962108
/* Emit the XLOG commit record */
2097-
recptr=XactLogCommitRecord(GetCurrentTimestamp(),
2109+
recptr=XactLogCommitRecord(committs,
20982110
nchildren,children,nrels,rels,
20992111
ninvalmsgs,invalmsgs,
21002112
initfileinval, false,
21012113
xid);
21022114

2115+
2116+
if (replorigin)
2117+
/* Move LSNs forward for this replication origin */
2118+
replorigin_session_advance(replorigin_session_origin_lsn,
2119+
XactLastRecEnd);
2120+
2121+
/*
2122+
* Record commit timestamp. The value comes from plain commit timestamp
2123+
* if replorigin is not enabled, or replorigin already set a value for us
2124+
* in replorigin_session_origin_timestamp otherwise.
2125+
*
2126+
* We don't need to WAL-log anything here, as the commit record written
2127+
* above already contains the data.
2128+
*/
2129+
if (!replorigin||replorigin_session_origin_timestamp==0)
2130+
replorigin_session_origin_timestamp=committs;
2131+
2132+
TransactionTreeSetCommitTsData(xid,nchildren,children,
2133+
replorigin_session_origin_timestamp,
2134+
replorigin_session_origin, false, false);
2135+
21032136
/*
21042137
* We don't currently try to sleep before flush here ... nor is there any
21052138
* support for async commit of a prepared xact (the very idea is probably

‎src/backend/access/transam/xact.c

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
#include"miscadmin.h"
4343
#include"pgstat.h"
4444
#include"replication/logical.h"
45-
#include"replication/walsender.h"
46-
#include"replication/syncrep.h"
4745
#include"replication/origin.h"
46+
#include"replication/syncrep.h"
47+
#include"replication/walsender.h"
4848
#include"storage/fd.h"
4949
#include"storage/lmgr.h"
5050
#include"storage/predicate.h"
@@ -1119,6 +1119,8 @@ AtSubStart_ResourceOwner(void)
11191119
*
11201120
* Returns latest XID among xact and its children, or InvalidTransactionId
11211121
* if the xact has no XID. (We compute that here just because it's easier.)
1122+
*
1123+
* If you change this function, see RecordTransactionCommitPrepared also.
11221124
*/
11231125
staticTransactionId
11241126
RecordTransactionCommit(void)
@@ -1172,6 +1174,15 @@ RecordTransactionCommit(void)
11721174
}
11731175
else
11741176
{
1177+
boolreplorigin;
1178+
1179+
/*
1180+
* Are we using the replication origins feature? Or, in other words,
1181+
* are we replaying remote actions?
1182+
*/
1183+
replorigin= (replorigin_session_origin!=InvalidRepOriginId&&
1184+
replorigin_session_origin!=DoNotReplicateId);
1185+
11751186
/*
11761187
* Begin commit critical section and insert the commit XLOG record.
11771188
*/
@@ -1206,26 +1217,28 @@ RecordTransactionCommit(void)
12061217
RelcacheInitFileInval,forceSyncCommit,
12071218
InvalidTransactionId/* plain commit */ );
12081219

1209-
/*
1210-
* Record plain commit ts if not replaying remote actions, or if no
1211-
* timestamp is configured.
1212-
*/
1213-
if (replorigin_session_origin==InvalidRepOriginId||
1214-
replorigin_session_origin==DoNotReplicateId||
1215-
replorigin_session_origin_timestamp==0)
1216-
replorigin_session_origin_timestamp=xactStopTimestamp;
1217-
else
1220+
if (replorigin)
1221+
/* Move LSNs forward for this replication origin */
12181222
replorigin_session_advance(replorigin_session_origin_lsn,
12191223
XactLastRecEnd);
12201224

12211225
/*
1222-
* We don't need to WAL log origin or timestamp here, the commit
1223-
* record contains all the necessary information and will redo the SET
1224-
* action during replay.
1226+
* Record commit timestamp. The value comes from plain commit
1227+
* timestamp if there's no replication origin; otherwise, the
1228+
* timestamp was already set in replorigin_session_origin_timestamp by
1229+
* replication.
1230+
*
1231+
* We don't need to WAL-log anything here, as the commit record
1232+
* written above already contains the data.
12251233
*/
1234+
1235+
if (!replorigin||replorigin_session_origin_timestamp==0)
1236+
replorigin_session_origin_timestamp=xactStopTimestamp;
1237+
12261238
TransactionTreeSetCommitTsData(xid,nchildren,children,
12271239
replorigin_session_origin_timestamp,
1228-
replorigin_session_origin, false);
1240+
replorigin_session_origin,
1241+
false, false);
12291242
}
12301243

12311244
/*
@@ -5321,7 +5334,7 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
53215334
/* Set the transaction commit timestamp and metadata */
53225335
TransactionTreeSetCommitTsData(xid,parsed->nsubxacts,parsed->subxacts,
53235336
commit_time,origin_id,
5324-
false);
5337+
true,false);
53255338

53265339
if (standbyState==STANDBY_DISABLED)
53275340
{

‎src/backend/access/transam/xlog.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5826,19 +5826,6 @@ do { \
58265826
minValue))); \
58275827
} while(0)
58285828

5829-
#defineRecoveryRequiresBoolParameter(param_name,currValue,masterValue) \
5830-
do { \
5831-
bool _currValue = (currValue); \
5832-
bool _masterValue = (masterValue); \
5833-
if (_currValue != _masterValue) \
5834-
ereport(ERROR, \
5835-
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), \
5836-
errmsg("hot standby is not possible because it requires \"%s\" to be same on master and standby (master has \"%s\", standby has \"%s\")", \
5837-
param_name, \
5838-
_masterValue ? "true" : "false", \
5839-
_currValue ? "true" : "false"))); \
5840-
} while(0)
5841-
58425829
/*
58435830
* Check to see if required parameters are set high enough on this server
58445831
* for various aspects of recovery operation.
@@ -5885,9 +5872,6 @@ CheckRequiredParameterValues(void)
58855872
RecoveryRequiresIntParameter("max_locks_per_transaction",
58865873
max_locks_per_xact,
58875874
ControlFile->max_locks_per_xact);
5888-
RecoveryRequiresBoolParameter("track_commit_timestamp",
5889-
track_commit_timestamp,
5890-
ControlFile->track_commit_timestamp);
58915875
}
58925876
}
58935877

‎src/include/access/commit_ts.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ extern bool check_track_commit_timestamp(bool *newval, void **extra,
2424

2525
externvoidTransactionTreeSetCommitTsData(TransactionIdxid,intnsubxids,
2626
TransactionId*subxids,TimestampTztimestamp,
27-
RepOriginIdnodeid,booldo_xlog);
27+
RepOriginIdnodeid,
28+
boolreplaying_xlog,boolwrite_xlog);
2829
externboolTransactionIdGetCommitTsData(TransactionIdxid,
2930
TimestampTz*ts,RepOriginId*nodeid);
3031
externTransactionIdGetLatestCommitTsData(TimestampTz*ts,
@@ -67,4 +68,4 @@ extern void commit_ts_redo(XLogReaderState *record);
6768
externvoidcommit_ts_desc(StringInfobuf,XLogReaderState*record);
6869
externconstchar*commit_ts_identify(uint8info);
6970

70-
#endif/*COMMITTS_H */
71+
#endif/*COMMIT_TS_H */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp