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

Commit35250b6

Browse files
New recovery target recovery_target_lsn
Michael Paquier
1 parent0c40ab3 commit35250b6

File tree

5 files changed

+120
-9
lines changed

5 files changed

+120
-9
lines changed

‎doc/src/sgml/recovery-config.sgml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,10 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
157157
By default, recovery will recover to the end of the WAL log. The
158158
following parameters can be used to specify an earlier stopping point.
159159
At most one of <varname>recovery_target</>,
160-
<varname>recovery_target_name</>, <varname>recovery_target_time</>, or
161-
<varname>recovery_target_xid</> can be used; if more than one of these
162-
is specified in the configuration file, the last entry will be used.
160+
<varname>recovery_target_lsn</>, <varname>recovery_target_name</>,
161+
<varname>recovery_target_time</>, or <varname>recovery_target_xid</>
162+
can be used; if more than one of these is specified in the configuration
163+
file, the last entry will be used.
163164
</para>
164165

165166
<variablelist>
@@ -232,6 +233,23 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
232233
</para>
233234
</listitem>
234235
</varlistentry>
236+
237+
<varlistentry id="recovery-target-lsn" xreflabel="recovery_target_lsn">
238+
<term><varname>recovery_target_lsn</varname> (<type>pg_lsn</type>)
239+
<indexterm>
240+
<primary><varname>recovery_target_lsn</> recovery parameter</primary>
241+
</indexterm>
242+
</term>
243+
<listitem>
244+
<para>
245+
This parameter specifies the LSN of the transaction log location up
246+
to which recovery will proceed. The precise stopping point is also
247+
influenced by <xref linkend="recovery-target-inclusive">. This
248+
parameter is parsed using the system data type
249+
<link linkend="datatype-pg-lsn"><type>pg_lsn</></link>.
250+
</para>
251+
</listitem>
252+
</varlistentry>
235253
</variablelist>
236254

237255
<para>

‎src/backend/access/transam/recovery.conf.sample

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
# must set a recovery target.
6868
#
6969
# You may set a recovery target either by transactionId, by name,
70-
# or bytimestamp. Recovery may either include or exclude the
71-
# transaction(s) with the recovery target value (ie, stop either
70+
#by timestampor byWAL position (LSN). Recovery may either include or
71+
#exclude thetransaction(s) with the recovery target value (ie, stop either
7272
# just after or just before the given target, respectively).
7373
#
7474
#
@@ -78,6 +78,8 @@
7878
#
7979
#recovery_target_xid = ''
8080
#
81+
#recovery_target_lsn = ''# e.g. '0/70006B8'
82+
#
8183
#recovery_target_inclusive = true
8284
#
8385
#

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

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
#include"utils/builtins.h"
6868
#include"utils/guc.h"
6969
#include"utils/memutils.h"
70+
#include"utils/pg_lsn.h"
7071
#include"utils/ps_status.h"
7172
#include"utils/relmapper.h"
7273
#include"utils/snapmgr.h"
@@ -254,6 +255,7 @@ static RecoveryTargetAction recoveryTargetAction = RECOVERY_TARGET_ACTION_PAUSE;
254255
staticTransactionIdrecoveryTargetXid;
255256
staticTimestampTzrecoveryTargetTime;
256257
staticchar*recoveryTargetName;
258+
staticXLogRecPtrrecoveryTargetLSN;
257259
staticintrecovery_min_apply_delay=0;
258260
staticTimestampTzrecoveryDelayUntilTime;
259261

@@ -275,6 +277,7 @@ static bool fast_promote = false;
275277
*/
276278
staticTransactionIdrecoveryStopXid;
277279
staticTimestampTzrecoveryStopTime;
280+
staticXLogRecPtrrecoveryStopLSN;
278281
staticcharrecoveryStopName[MAXFNAMELEN];
279282
staticboolrecoveryStopAfter;
280283

@@ -5078,6 +5081,23 @@ readRecoveryCommandFile(void)
50785081
(errmsg_internal("recovery_target_name = '%s'",
50795082
recoveryTargetName)));
50805083
}
5084+
elseif (strcmp(item->name,"recovery_target_lsn")==0)
5085+
{
5086+
recoveryTarget=RECOVERY_TARGET_LSN;
5087+
5088+
/*
5089+
* Convert the LSN string given by the user to XLogRecPtr form.
5090+
*/
5091+
recoveryTargetLSN=
5092+
DatumGetLSN(DirectFunctionCall3(pg_lsn_in,
5093+
CStringGetDatum(item->value),
5094+
ObjectIdGetDatum(InvalidOid),
5095+
Int32GetDatum(-1)));
5096+
ereport(DEBUG2,
5097+
(errmsg_internal("recovery_target_lsn = '%X/%X'",
5098+
(uint32) (recoveryTargetLSN >>32),
5099+
(uint32)recoveryTargetLSN)));
5100+
}
50815101
elseif (strcmp(item->name,"recovery_target")==0)
50825102
{
50835103
if (strcmp(item->value,"immediate")==0)
@@ -5400,8 +5420,26 @@ recoveryStopsBefore(XLogReaderState *record)
54005420

54015421
recoveryStopAfter= false;
54025422
recoveryStopXid=InvalidTransactionId;
5423+
recoveryStopLSN=InvalidXLogRecPtr;
5424+
recoveryStopTime=0;
5425+
recoveryStopName[0]='\0';
5426+
return true;
5427+
}
5428+
5429+
/* Check if target LSN has been reached */
5430+
if (recoveryTarget==RECOVERY_TARGET_LSN&&
5431+
!recoveryTargetInclusive&&
5432+
record->ReadRecPtr >=recoveryTargetLSN)
5433+
{
5434+
recoveryStopAfter= false;
5435+
recoveryStopXid=InvalidTransactionId;
5436+
recoveryStopLSN=record->ReadRecPtr;
54035437
recoveryStopTime=0;
54045438
recoveryStopName[0]='\0';
5439+
ereport(LOG,
5440+
(errmsg("recovery stopping before WAL position (LSN) \"%X/%X\"",
5441+
(uint32) (recoveryStopLSN >>32),
5442+
(uint32)recoveryStopLSN)));
54055443
return true;
54065444
}
54075445

@@ -5479,6 +5517,7 @@ recoveryStopsBefore(XLogReaderState *record)
54795517
recoveryStopAfter= false;
54805518
recoveryStopXid=recordXid;
54815519
recoveryStopTime=recordXtime;
5520+
recoveryStopLSN=InvalidXLogRecPtr;
54825521
recoveryStopName[0]='\0';
54835522

54845523
if (isCommit)
@@ -5532,6 +5571,7 @@ recoveryStopsAfter(XLogReaderState *record)
55325571
{
55335572
recoveryStopAfter= true;
55345573
recoveryStopXid=InvalidTransactionId;
5574+
recoveryStopLSN=InvalidXLogRecPtr;
55355575
(void)getRecordTimestamp(record,&recoveryStopTime);
55365576
strlcpy(recoveryStopName,recordRestorePointData->rp_name,MAXFNAMELEN);
55375577

@@ -5543,6 +5583,23 @@ recoveryStopsAfter(XLogReaderState *record)
55435583
}
55445584
}
55455585

5586+
/* Check if the target LSN has been reached */
5587+
if (recoveryTarget==RECOVERY_TARGET_LSN&&
5588+
recoveryTargetInclusive&&
5589+
record->ReadRecPtr >=recoveryTargetLSN)
5590+
{
5591+
recoveryStopAfter= true;
5592+
recoveryStopXid=InvalidTransactionId;
5593+
recoveryStopLSN=record->ReadRecPtr;
5594+
recoveryStopTime=0;
5595+
recoveryStopName[0]='\0';
5596+
ereport(LOG,
5597+
(errmsg("recovery stopping after WAL position (LSN) \"%X/%X\"",
5598+
(uint32) (recoveryStopLSN >>32),
5599+
(uint32)recoveryStopLSN)));
5600+
return true;
5601+
}
5602+
55465603
if (rmid!=RM_XACT_ID)
55475604
return false;
55485605

@@ -5598,6 +5655,7 @@ recoveryStopsAfter(XLogReaderState *record)
55985655
recoveryStopAfter= true;
55995656
recoveryStopXid=recordXid;
56005657
recoveryStopTime=recordXtime;
5658+
recoveryStopLSN=InvalidXLogRecPtr;
56015659
recoveryStopName[0]='\0';
56025660

56035661
if (xact_info==XLOG_XACT_COMMIT||
@@ -5629,6 +5687,7 @@ recoveryStopsAfter(XLogReaderState *record)
56295687
recoveryStopAfter= true;
56305688
recoveryStopXid=InvalidTransactionId;
56315689
recoveryStopTime=0;
5690+
recoveryStopLSN=InvalidXLogRecPtr;
56325691
recoveryStopName[0]='\0';
56335692
return true;
56345693
}
@@ -6055,6 +6114,11 @@ StartupXLOG(void)
60556114
ereport(LOG,
60566115
(errmsg("starting point-in-time recovery to \"%s\"",
60576116
recoveryTargetName)));
6117+
elseif (recoveryTarget==RECOVERY_TARGET_LSN)
6118+
ereport(LOG,
6119+
(errmsg("starting point-in-time recovery to WAL position (LSN) \"%X/%X\"",
6120+
(uint32) (recoveryTargetLSN >>32),
6121+
(uint32)recoveryTargetLSN)));
60586122
elseif (recoveryTarget==RECOVERY_TARGET_IMMEDIATE)
60596123
ereport(LOG,
60606124
(errmsg("starting point-in-time recovery to earliest consistent point")));
@@ -7124,6 +7188,12 @@ StartupXLOG(void)
71247188
"%s %s\n",
71257189
recoveryStopAfter ?"after" :"before",
71267190
timestamptz_to_str(recoveryStopTime));
7191+
elseif (recoveryTarget==RECOVERY_TARGET_LSN)
7192+
snprintf(reason,sizeof(reason),
7193+
"%s LSN %X/%X\n",
7194+
recoveryStopAfter ?"after" :"before",
7195+
(uint32 ) (recoveryStopLSN >>32),
7196+
(uint32)recoveryStopLSN);
71277197
elseif (recoveryTarget==RECOVERY_TARGET_NAME)
71287198
snprintf(reason,sizeof(reason),
71297199
"at restore point \"%s\"",

‎src/include/access/xlog.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ typedef enum
8383
RECOVERY_TARGET_XID,
8484
RECOVERY_TARGET_TIME,
8585
RECOVERY_TARGET_NAME,
86+
RECOVERY_TARGET_LSN,
8687
RECOVERY_TARGET_IMMEDIATE
8788
}RecoveryTargetType;
8889

‎src/test/recovery/t/003_recovery_targets.pl

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use warnings;
44
use PostgresNode;
55
use TestLib;
6-
use Test::Moretests=>7;
6+
use Test::Moretests=>9;
77

88
# Create and test a standby from given backup, with a certain
99
# recovery target.
@@ -86,6 +86,16 @@ sub test_recovery_standby
8686
$node_master->safe_psql('postgres',
8787
"SELECT pg_create_restore_point('$recovery_name');");
8888

89+
# And now for a recovery target LSN
90+
$node_master->safe_psql('postgres',
91+
"INSERT INTO tab_int VALUES (generate_series(4001,5000))");
92+
my$recovery_lsn =$node_master->safe_psql('postgres',"SELECT pg_current_xlog_location()");
93+
my$lsn5 =
94+
$node_master->safe_psql('postgres',"SELECT pg_current_xlog_location();");
95+
96+
$node_master->safe_psql('postgres',
97+
"INSERT INTO tab_int VALUES (generate_series(5001,6000))");
98+
8999
# Force archiving of WAL file
90100
$node_master->safe_psql('postgres',"SELECT pg_switch_xlog()");
91101

@@ -102,6 +112,9 @@ sub test_recovery_standby
102112
@recovery_params = ("recovery_target_name = '$recovery_name'");
103113
test_recovery_standby('name','standby_4',$node_master, \@recovery_params,
104114
"4000",$lsn4);
115+
@recovery_params = ("recovery_target_lsn = '$recovery_lsn'");
116+
test_recovery_standby('LSN','standby_5',$node_master, \@recovery_params,
117+
"5000",$lsn5);
105118

106119
# Multiple targets
107120
# Last entry has priority (note that an array respects the order of items
@@ -111,16 +124,23 @@ sub test_recovery_standby
111124
"recovery_target_xid = '$recovery_txid'",
112125
"recovery_target_time = '$recovery_time'");
113126
test_recovery_standby('name + XID + time',
114-
'standby_5',$node_master, \@recovery_params,"3000",$lsn3);
127+
'standby_6',$node_master, \@recovery_params,"3000",$lsn3);
115128
@recovery_params = (
116129
"recovery_target_time = '$recovery_time'",
117130
"recovery_target_name = '$recovery_name'",
118131
"recovery_target_xid = '$recovery_txid'");
119132
test_recovery_standby('time + name + XID',
120-
'standby_6',$node_master, \@recovery_params,"2000",$lsn2);
133+
'standby_7',$node_master, \@recovery_params,"2000",$lsn2);
121134
@recovery_params = (
122135
"recovery_target_xid = '$recovery_txid'",
123136
"recovery_target_time = '$recovery_time'",
124137
"recovery_target_name = '$recovery_name'");
125138
test_recovery_standby('XID + time + name',
126-
'standby_7',$node_master, \@recovery_params,"4000",$lsn4);
139+
'standby_8',$node_master, \@recovery_params,"4000",$lsn4);
140+
@recovery_params = (
141+
"recovery_target_xid = '$recovery_txid'",
142+
"recovery_target_time = '$recovery_time'",
143+
"recovery_target_name = '$recovery_name'",
144+
"recovery_target_lsn = '$recovery_lsn'",);
145+
test_recovery_standby('XID + time + name + LSN',
146+
'standby_9',$node_master, \@recovery_params,"5000",$lsn5);

0 commit comments

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