From 28a06a2cb84102a92da3fca0f0055dd67902d7de Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Wed, 26 Jan 2022 16:24:04 -0800 Subject: [PATCH v4 2/2] minor improvements to replication code --- src/backend/replication/logical/snapbuild.c | 19 ++----------------- src/backend/replication/slot.c | 5 +---- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c index 57f5a5e81f..ce6cb85c1a 100644 --- a/src/backend/replication/logical/snapbuild.c +++ b/src/backend/replication/logical/snapbuild.c @@ -1970,16 +1970,10 @@ CheckPointSnapBuild(void) * everything but are postfixed by .$pid.tmp. We can just remove them * the same as other files because there can be none that are * currently being written that are older than cutoff. - * - * We just log a message if a file doesn't fit the pattern, it's - * probably some editors lock/state file or similar... */ if (sscanf(snap_de->d_name, "%X-%X.snap", &hi, &lo) != 2) - { - ereport(LOG, + ereport(ERROR, (errmsg("could not parse file name \"%s\"", path))); - continue; - } lsn = ((uint64) hi) << 32 | lo; @@ -1987,20 +1981,11 @@ CheckPointSnapBuild(void) if (lsn < cutoff || cutoff == InvalidXLogRecPtr) { elog(DEBUG1, "removing snapbuild snapshot %s", path); - - /* - * It's not particularly harmful, though strange, if we can't - * remove the file here. Don't prevent the checkpoint from - * completing, that'd be a cure worse than the disease. - */ if (unlink(path) < 0) - { - ereport(LOG, + ereport(ERROR, (errcode_for_file_access(), errmsg("could not remove file \"%s\": %m", path))); - continue; - } } } FreeDir(snap_dir); diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index 21fb7536e2..37ec3fa633 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -1424,12 +1424,9 @@ StartupReplicationSlots(void) if (pg_str_endswith(replication_de->d_name, ".tmp")) { if (!rmtree(path, true)) - { - ereport(WARNING, + ereport(ERROR, (errmsg("could not remove directory \"%s\"", path))); - continue; - } fsync_fname("pg_replslot", true); continue; } -- 2.25.1