sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-16 00:04:05 -05:00
Code Issues Projects Releases Wiki Activity

pg_createsubscriber: Use new routine to retrieve data of PG_VERSION

Browse Source 
pg_createsubscriber is documented as requiring the same major version as
the target clusters.  Attempting to use this tool on a cluster where the
control file version read does not match with the version compiled with
would lead to the following error message:
pg_createsubscriber: error: control file appears to be corrupt

This is confusing as the control file is correct: only the version
expected does not match.  This commit integrates pg_createsubscriber
with the facility added by cd0be131ba6f, where the contents of
PG_VERSION are read and compared with the value of PG_MAJORVERSION_NUM
expected by the tool.  This puts pg_createsubscriber in line with the
documentation, with a better error message when the version does not
match.

Author: Michael Paquier <michael@paquier.xyz>
Reviewed-by: Masahiko Sawada <sawada.mshk@gmail.com>
Discussion: https://postgr.es/m/aONDWig0bIGilixs@paquier.xyz
This commit is contained in:
Michael Paquier 2025-10-15 11:11:30 +09:00
parent c6a6cd53d3
commit fa55be2a50
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/pg_basebackup/pg_createsubscriber.c
View File

@ -26,6 +26,7 @@
#include "fe_utils/recovery_gen.h"
#include "fe_utils/simple_list.h"
#include "fe_utils/string_utils.h"
#include "fe_utils/version.h"
#include "getopt_long.h"
#define DEFAULT_SUB_PORT "50432"
@ -407,7 +408,8 @@ static void
check_data_directory(const char *datadir)
{
struct stat statbuf;
char versionfile[MAXPGPATH];
uint32 major_version;
char *version_str;
pg_log_info("checking if directory \"%s\" is a cluster data directory",
datadir);
@ -420,11 +422,18 @@ check_data_directory(const char *datadir)
pg_fatal("could not access directory \"%s\": %m", datadir);
}
snprintf(versionfile, MAXPGPATH, "%s/PG_VERSION", datadir);
if (stat(versionfile, &statbuf) != 0 && errno == ENOENT)
/*
* Retrieve the contents of this cluster's PG_VERSION. We require
* compatibility with the same major version as the one this tool is
* compiled with.
*/
major_version = GET_PG_MAJORVERSION_NUM(get_pg_version(datadir, &version_str));
if (major_version != PG_MAJORVERSION_NUM)
{
pg_fatal("directory \"%s\" is not a database cluster directory",
datadir);
pg_log_error("data directory is of wrong version");
pg_log_error_detail("File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\".",
"PG_VERSION", version_str, PG_MAJORVERSION);
exit(1);
}
}