On Thu, Jan 28, 2010 at 5:28 PM, Heikki Linnakangas
<heikki.linnakan...@enterprisedb.com> wrote:
> How about extending the format of the string returned by
> pg_last_xlog_receive/replay_location() to include the timeline ID? When
> it currently returns e.g '6/200016C', it could return '1/6/200016C',
> where 1 is the timeline ID. Then just teach pg_xlogfile_name[_offset]()
> to accept that format as well.
Sounds good. The attached patch does so. Also the code is available
in the 'replication' branch in my git repository.
Regards,
--
Fujii Masao
NIPPON TELEGRAPH AND TELEPHONE CORPORATION
NTT Open Source Software Center
*** a/doc/src/sgml/func.sgml
--- b/doc/src/sgml/func.sgml
***************
*** 13152,13157 **** postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
--- 13152,13161 ----
This is usually the desired behavior for managing transaction log archiving
behavior, since the preceding file is the last one that currently
needs to be archived.
+ These functions also accept as a parameter the string that consists of timeline and
+ location, separated by a slash. In this case a transaction log file name is computed
+ by using the given timeline. On the other hand, if timeline is not supplied, the
+ current timeline is used for the computation.
</para>
<para>
***************
*** 13198,13210 **** postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
<literal><function>pg_last_xlog_receive_location</function>()</literal>
</entry>
<entry><type>text</type></entry>
! <entry>Get last transaction log location received and synced to disk during
! streaming recovery. If streaming recovery is still in progress
this will increase monotonically. If streaming recovery has completed
then this value will remain static at the value of the last WAL record
received and synced to disk during that recovery. When the server has
been started without a streaming recovery then the return value will be
! InvalidXLogRecPtr (0/0).
</entry>
</row>
<row>
--- 13202,13216 ----
<literal><function>pg_last_xlog_receive_location</function>()</literal>
</entry>
<entry><type>text</type></entry>
! <entry>Get timeline and location of last transaction log received and synced
! to disk during streaming recovery. The return string is separated by a slash,
! the first value indicates the timeline and the other the location.
! If streaming recovery is still in progress
this will increase monotonically. If streaming recovery has completed
then this value will remain static at the value of the last WAL record
received and synced to disk during that recovery. When the server has
been started without a streaming recovery then the return value will be
! <literal>0/0/0</>.
</entry>
</row>
<row>
***************
*** 13212,13223 **** postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
<literal><function>pg_last_xlog_replay_location</function>()</literal>
</entry>
<entry><type>text</type></entry>
! <entry>Get last transaction log location replayed during recovery.
If recovery is still in progress this will increase monotonically.
If recovery has completed then this value will remain static at
the value of the last WAL record applied during that recovery.
When the server has been started normally without a recovery
! then the return value will be InvalidXLogRecPtr (0/0).
</entry>
</row>
</tbody>
--- 13218,13231 ----
<literal><function>pg_last_xlog_replay_location</function>()</literal>
</entry>
<entry><type>text</type></entry>
! <entry>Get timeline and location of last transaction log replayed during
! recovery. The return string is separated by a slash, the first value
! indicates the timeline and the other the location.
If recovery is still in progress this will increase monotonically.
If recovery has completed then this value will remain static at
the value of the last WAL record applied during that recovery.
When the server has been started normally without a recovery
! then the return value will be <literal>0/0/0</>.
</entry>
</row>
</tbody>
*** a/src/backend/access/transam/xlog.c
--- b/src/backend/access/transam/xlog.c
***************
*** 395,400 **** typedef struct XLogCtlData
--- 395,402 ----
TimestampTz recoveryLastXTime;
/* end+1 of the last record replayed */
XLogRecPtr recoveryLastRecPtr;
+ /* tli of last record replayed */
+ TimeLineID recoveryLastTLI;
slock_t info_lck; /* locks shared variables shown above */
} XLogCtlData;
***************
*** 5864,5873 **** StartupXLOG(void)
/* use volatile pointer to prevent code rearrangement */
volatile XLogCtlData *xlogctl = XLogCtl;
! /* initialize shared replayEndRecPtr and recoveryLastRecPtr */
SpinLockAcquire(&xlogctl->info_lck);
xlogctl->replayEndRecPtr = ReadRecPtr;
xlogctl->recoveryLastRecPtr = ReadRecPtr;
SpinLockRelease(&xlogctl->info_lck);
InRedo = true;
--- 5866,5882 ----
/* use volatile pointer to prevent code rearrangement */
volatile XLogCtlData *xlogctl = XLogCtl;
! /*
! * initialize shared replayEndRecPtr, recoveryLastRecPtr and
! * recoveryLastTLI. Actually, the latter two variables don't need to
! * be initialized here since they are expected to be updated at least
! * once until read only connections will have read them. But just in
! * case.
! */
SpinLockAcquire(&xlogctl->info_lck);
xlogctl->replayEndRecPtr = ReadRecPtr;
xlogctl->recoveryLastRecPtr = ReadRecPtr;
+ xlogctl->recoveryLastTLI = curFileTLI;
SpinLockRelease(&xlogctl->info_lck);
InRedo = true;
***************
*** 5995,6005 **** StartupXLOG(void)
error_context_stack = errcontext.previous;
/*
! * Update shared recoveryLastRecPtr after this record has been
! * replayed.
*/
SpinLockAcquire(&xlogctl->info_lck);
xlogctl->recoveryLastRecPtr = EndRecPtr;
SpinLockRelease(&xlogctl->info_lck);
LastRec = ReadRecPtr;
--- 6004,6015 ----
error_context_stack = errcontext.previous;
/*
! * Update shared recoveryLastRecPtr and recoveryLastTLI
! * after this record has been replayed.
*/
SpinLockAcquire(&xlogctl->info_lck);
xlogctl->recoveryLastRecPtr = EndRecPtr;
+ xlogctl->recoveryLastTLI = curFileTLI;
SpinLockRelease(&xlogctl->info_lck);
LastRec = ReadRecPtr;
***************
*** 8334,8340 **** pg_current_xlog_insert_location(PG_FUNCTION_ARGS)
}
/*
! * Report the last WAL receive location (same format as pg_start_backup etc)
*
* This is useful for determining how much of WAL is guaranteed to be received
* and synced to disk by walreceiver.
--- 8344,8350 ----
}
/*
! * Report the last WAL receive tli and location
*
* This is useful for determining how much of WAL is guaranteed to be received
* and synced to disk by walreceiver.
***************
*** 8347,8359 **** pg_last_xlog_receive_location(PG_FUNCTION_ARGS)
recptr = GetWalRcvWriteRecPtr();
! snprintf(location, sizeof(location), "%X/%X",
recptr.xlogid, recptr.xrecoff);
PG_RETURN_TEXT_P(cstring_to_text(location));
}
/*
! * Report the last WAL replay location (same format as pg_start_backup etc)
*
* This is useful for determining how much of WAL is visible to read-only
* connections during recovery.
--- 8357,8370 ----
recptr = GetWalRcvWriteRecPtr();
! snprintf(location, sizeof(location), "%X/%X/%X",
! XLogRecPtrIsInvalid(recptr) ? 0 : GetRecoveryTargetTLI(),
recptr.xlogid, recptr.xrecoff);
PG_RETURN_TEXT_P(cstring_to_text(location));
}
/*
! * Report the last WAL replay tli and location
*
* This is useful for determining how much of WAL is visible to read-only
* connections during recovery.
***************
*** 8363,8377 **** pg_last_xlog_replay_location(PG_FUNCTION_ARGS)
{
/* use volatile pointer to prevent code rearrangement */
volatile XLogCtlData *xlogctl = XLogCtl;
XLogRecPtr recptr;
char location[MAXFNAMELEN];
SpinLockAcquire(&xlogctl->info_lck);
recptr = xlogctl->recoveryLastRecPtr;
SpinLockRelease(&xlogctl->info_lck);
! snprintf(location, sizeof(location), "%X/%X",
! recptr.xlogid, recptr.xrecoff);
PG_RETURN_TEXT_P(cstring_to_text(location));
}
--- 8374,8390 ----
{
/* use volatile pointer to prevent code rearrangement */
volatile XLogCtlData *xlogctl = XLogCtl;
+ TimeLineID tli;
XLogRecPtr recptr;
char location[MAXFNAMELEN];
SpinLockAcquire(&xlogctl->info_lck);
+ tli = xlogctl->recoveryLastTLI;
recptr = xlogctl->recoveryLastRecPtr;
SpinLockRelease(&xlogctl->info_lck);
! snprintf(location, sizeof(location), "%X/%X/%X",
! tli, recptr.xlogid, recptr.xrecoff);
PG_RETURN_TEXT_P(cstring_to_text(location));
}
***************
*** 8379,8384 **** pg_last_xlog_replay_location(PG_FUNCTION_ARGS)
--- 8392,8401 ----
* Compute an xlog file name and decimal byte offset given a WAL location,
* such as is returned by pg_stop_backup() or pg_xlog_switch().
*
+ * Also use the tli for the computation if it's given with a location,
+ * such as is returned by pg_last_xlog_receive_location() or
+ * pg_last_xlog_replay_location().
+ *
* Note that a location exactly at a segment boundary is taken to be in
* the previous segment. This is usually the right thing, since the
* expected usage is to determine which xlog file(s) are ready to archive.
***************
*** 8388,8398 **** pg_xlogfile_name_offset(PG_FUNCTION_ARGS)
--- 8405,8417 ----
{
text *location = PG_GETARG_TEXT_P(0);
char *locationstr;
+ unsigned int utli;
unsigned int uxlogid;
unsigned int uxrecoff;
uint32 xlogid;
uint32 xlogseg;
uint32 xrecoff;
+ TimeLineID tli = ThisTimeLineID;
XLogRecPtr locationpoint;
char xlogfilename[MAXFNAMELEN];
Datum values[2];
***************
*** 8406,8412 **** pg_xlogfile_name_offset(PG_FUNCTION_ARGS)
*/
locationstr = text_to_cstring(location);
! if (sscanf(locationstr, "%X/%X", &uxlogid, &uxrecoff) != 2)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("could not parse transaction log location \"%s\"",
--- 8425,8433 ----
*/
locationstr = text_to_cstring(location);
! if (sscanf(locationstr, "%X/%X/%X", &utli, &uxlogid, &uxrecoff) == 3)
! tli = (TimeLineID) utli;
! else if (sscanf(locationstr, "%X/%X", &uxlogid, &uxrecoff) != 2)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("could not parse transaction log location \"%s\"",
***************
*** 8431,8437 **** pg_xlogfile_name_offset(PG_FUNCTION_ARGS)
* xlogfilename
*/
XLByteToPrevSeg(locationpoint, xlogid, xlogseg);
! XLogFileName(xlogfilename, ThisTimeLineID, xlogid, xlogseg);
values[0] = CStringGetTextDatum(xlogfilename);
isnull[0] = false;
--- 8452,8458 ----
* xlogfilename
*/
XLByteToPrevSeg(locationpoint, xlogid, xlogseg);
! XLogFileName(xlogfilename, tli, xlogid, xlogseg);
values[0] = CStringGetTextDatum(xlogfilename);
isnull[0] = false;
***************
*** 8457,8478 **** pg_xlogfile_name_offset(PG_FUNCTION_ARGS)
/*
* Compute an xlog file name given a WAL location,
* such as is returned by pg_stop_backup() or pg_xlog_switch().
*/
Datum
pg_xlogfile_name(PG_FUNCTION_ARGS)
{
text *location = PG_GETARG_TEXT_P(0);
char *locationstr;
unsigned int uxlogid;
unsigned int uxrecoff;
uint32 xlogid;
uint32 xlogseg;
XLogRecPtr locationpoint;
char xlogfilename[MAXFNAMELEN];
locationstr = text_to_cstring(location);
! if (sscanf(locationstr, "%X/%X", &uxlogid, &uxrecoff) != 2)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("could not parse transaction log location \"%s\"",
--- 8478,8507 ----
/*
* Compute an xlog file name given a WAL location,
* such as is returned by pg_stop_backup() or pg_xlog_switch().
+ *
+ * Also use the tli for the computation if it's given with a location,
+ * such as is returned by pg_last_xlog_receive_location() or
+ * pg_last_xlog_replay_location().
*/
Datum
pg_xlogfile_name(PG_FUNCTION_ARGS)
{
text *location = PG_GETARG_TEXT_P(0);
char *locationstr;
+ unsigned int utli;
unsigned int uxlogid;
unsigned int uxrecoff;
uint32 xlogid;
uint32 xlogseg;
+ TimeLineID tli = ThisTimeLineID;
XLogRecPtr locationpoint;
char xlogfilename[MAXFNAMELEN];
locationstr = text_to_cstring(location);
! if (sscanf(locationstr, "%X/%X/%X", &utli, &uxlogid, &uxrecoff) == 3)
! tli = (TimeLineID) utli;
! else if (sscanf(locationstr, "%X/%X", &uxlogid, &uxrecoff) != 2)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("could not parse transaction log location \"%s\"",
***************
*** 8482,8488 **** pg_xlogfile_name(PG_FUNCTION_ARGS)
locationpoint.xrecoff = uxrecoff;
XLByteToPrevSeg(locationpoint, xlogid, xlogseg);
! XLogFileName(xlogfilename, ThisTimeLineID, xlogid, xlogseg);
PG_RETURN_TEXT_P(cstring_to_text(xlogfilename));
}
--- 8511,8517 ----
locationpoint.xrecoff = uxrecoff;
XLByteToPrevSeg(locationpoint, xlogid, xlogseg);
! XLogFileName(xlogfilename, tli, xlogid, xlogseg);
PG_RETURN_TEXT_P(cstring_to_text(xlogfilename));
}
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
