From 0e03c82ee07569b869b382fac83d98d0b5d5d870 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 14 Jul 2022 23:39:08 +0200 Subject: [PATCH v25 3/4] Don't rely on ignore_invalid_pages at all Since a workaround with allow_in_place_tablespaces is possible, there doesn't seem to be a need for the ignore_invalid_pages one. Remove it. --- src/backend/access/transam/xlogrecovery.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index e04d30cf3e..b0ae63fbac 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -2035,10 +2035,6 @@ is_path_tslink(const char *path) * is reached these directories should have been removed; here we verify * that this did indeed happen. This must be called after reached consistent * state. - * - * ignore_invalid_pages=on turns into the PANIC error into WARNING so that - * recovery can continue. XXX piggybacking on this particular GUC sounds like - * a bad idea. Why not just advise to use allow_in_place_tablespaces? */ static void CheckTablespaceDirectory(void) @@ -2065,7 +2061,7 @@ CheckTablespaceDirectory(void) snprintf(path, sizeof(path), "pg_tblspc/%s", de->d_name); if (!is_path_tslink(path)) - ereport(ignore_invalid_pages ? WARNING : PANIC, + ereport(PANIC, (errcode(ERRCODE_DATA_CORRUPTED), errmsg("real directory found in pg_tblspc directory: %s", de->d_name))); } -- 2.30.2