diff options
Diffstat (limited to 'src/backend/access/transam')
| -rw-r--r-- | src/backend/access/transam/rmgr.c | 4 | ||||
| -rw-r--r-- | src/backend/access/transam/xlog.c | 50 |
2 files changed, 9 insertions, 45 deletions
diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c index 41d437932cd..c0a7a6f1a57 100644 --- a/src/backend/access/transam/rmgr.c +++ b/src/backend/access/transam/rmgr.c @@ -25,8 +25,8 @@ #include "utils/relmapper.h" /* must be kept in sync with RmgrData definition in xlog_internal.h */ -#define PG_RMGR(symname,name,redo,desc,startup,cleanup,restartpoint) \ - { name, redo, desc, startup, cleanup, restartpoint }, +#define PG_RMGR(symname,name,redo,desc,startup,cleanup) \ + { name, redo, desc, startup, cleanup }, const RmgrData RmgrTable[RM_MAX_ID + 1] = { #include "access/rmgrlist.h" diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 5f3c3b9be1e..a2577314bcf 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7143,6 +7143,13 @@ StartupXLOG(void) recoveryPausesHere(); } + /* Allow resource managers to do any required cleanup. */ + for (rmid = 0; rmid <= RM_MAX_ID; rmid++) + { + if (RmgrTable[rmid].rm_cleanup != NULL) + RmgrTable[rmid].rm_cleanup(); + } + ereport(LOG, (errmsg("redo done at %X/%X", (uint32) (ReadRecPtr >> 32), (uint32) ReadRecPtr))); @@ -7368,27 +7375,6 @@ StartupXLOG(void) if (InRecovery) { - int rmid; - - /* - * Resource managers might need to write WAL records, eg, to record - * index cleanup actions. So temporarily enable XLogInsertAllowed in - * this process only. - */ - LocalSetXLogInsertAllowed(); - - /* - * Allow resource managers to do any required cleanup. - */ - for (rmid = 0; rmid <= RM_MAX_ID; rmid++) - { - if (RmgrTable[rmid].rm_cleanup != NULL) - RmgrTable[rmid].rm_cleanup(); - } - - /* Disallow XLogInsert again */ - LocalXLogInsertAllowed = -1; - /* * Perform a checkpoint to update all our recovery activity to disk. * @@ -8750,32 +8736,10 @@ CheckPointGuts(XLogRecPtr checkPointRedo, int flags) static void RecoveryRestartPoint(const CheckPoint *checkPoint) { - int rmid; - /* use volatile pointer to prevent code rearrangement */ volatile XLogCtlData *xlogctl = XLogCtl; /* - * Is it safe to restartpoint? We must ask each of the resource managers - * whether they have any partial state information that might prevent a - * correct restart from this point. If so, we skip this opportunity, but - * return at the next checkpoint record for another try. - */ - for (rmid = 0; rmid <= RM_MAX_ID; rmid++) - { - if (RmgrTable[rmid].rm_safe_restartpoint != NULL) - if (!(RmgrTable[rmid].rm_safe_restartpoint())) - { - elog(trace_recovery(DEBUG2), - "RM %d not safe to record restart point at %X/%X", - rmid, - (uint32) (checkPoint->redo >> 32), - (uint32) checkPoint->redo); - return; - } - } - - /* * Also refrain from creating a restartpoint if we have seen any * references to non-existent pages. Restarting recovery from the * restartpoint would not see the references, so we would lose the |