Skip to content

Commit a2b03fb

Browse files
author
Viktoria Shepard
committed
Revert "[PBCKP-1238] Warning when using the community Version of pg_pro backup 2 for ENT"
This reverts commit 98863ae
1 parent 3361578 commit a2b03fb

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

src/backup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ static bool pgpro_support(PGconn *conn);
6666
static bool pg_is_checksum_enabled(PGconn *conn);
6767
static bool pg_is_in_recovery(PGconn *conn);
6868
static bool pg_is_superuser(PGconn *conn);
69+
static void check_server_version(PGconn *conn, PGNodeInfo *nodeInfo);
6970
static void confirm_block_size(PGconn *conn, const char *name, int blcksz);
7071
static void rewind_and_mark_cfs_datafiles(parray *files, const char *root, char *relative, size_t i);
7172
static bool remove_excluded_files_criterion(void *value, void *exclude_args);
@@ -946,7 +947,7 @@ do_backup(InstanceState *instanceState, pgSetBackupParams *set_backup_params,
946947
/*
947948
* Confirm that this server version is supported
948949
*/
949-
void
950+
static void
950951
check_server_version(PGconn *conn, PGNodeInfo *nodeInfo)
951952
{
952953
PGresult *res = NULL;

src/pg_probackup.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -980,13 +980,7 @@ main(int argc, char *argv[])
980980
wal_file_path, wal_file_name, batch_size, !no_validate_wal);
981981
break;
982982
case ADD_INSTANCE_CMD:
983-
{
984-
PGNodeInfo nodeInfo;
985-
pgNodeInit(&nodeInfo);
986-
instanceState->conn = pgut_connect(dbhost, dbport, dbname, dbuser);
987-
check_server_version(instanceState->conn, &nodeInfo);
988-
return do_add_instance(instanceState, &instance_config);
989-
}
983+
return do_add_instance(instanceState, &instance_config);
990984
case DELETE_INSTANCE_CMD:
991985
return do_delete_instance(instanceState);
992986
case INIT_CMD:

src/pg_probackup.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,6 @@ extern const char *base36enc_to(long unsigned int value, char buf[ARG_SIZE_HINT
12451245
extern long unsigned int base36dec(const char *text);
12461246
extern uint32 parse_server_version(const char *server_version_str);
12471247
extern uint32 parse_program_version(const char *program_version);
1248-
void check_server_version(PGconn *conn, PGNodeInfo *nodeInfo);
12491248
extern bool parse_page(Page page, XLogRecPtr *lsn);
12501249
extern int32 do_compress(void* dst, size_t dst_size, void const* src, size_t src_size,
12511250
CompressAlg alg, int level, const char **errormsg);

0 commit comments

Comments
 (0)