Commit98863ae

Stepan Neretin

committed

[PBCKP-1238] Warning when using the community Version of pg_pro backup 2 for ENT

- Call check_version in add_instance subcmd to get correct error

1 parent0c02283 commit98863aeCopy full SHA for 98863ae

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ static bool pgpro_support(PGconn *conn);`
`66`	`66`	`staticboolpg_is_checksum_enabled(PGconn*conn);`
`67`	`67`	`staticboolpg_is_in_recovery(PGconn*conn);`
`68`	`68`	`staticboolpg_is_superuser(PGconn*conn);`
`69`		`-staticvoidcheck_server_version(PGconnconn,PGNodeInfonodeInfo);`
`70`	`69`	`staticvoidconfirm_block_size(PGconnconn,constcharname,intblcksz);`
`71`	`70`	`staticvoidrewind_and_mark_cfs_datafiles(parrayfiles,constcharroot,char*relative,size_ti);`
`72`	`71`	`staticboolremove_excluded_files_criterion(voidvalue,voidexclude_args);`
`@@ -947,7 +946,7 @@ do_backup(InstanceState instanceState, pgSetBackupParams set_backup_params,`
`947`	`946`	`/*`
`948`	`947`	`* Confirm that this server version is supported`
`949`	`948`	`*/`
`950`		`-staticvoid`
	`949`	`+void`
`951`	`950`	`check_server_version(PGconnconn,PGNodeInfonodeInfo)`
`952`	`951`	`{`
`953`	`952`	`PGresult*res=NULL;`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,13 @@ main(int argc, char *argv[])`
`980`	`980`	`wal_file_path,wal_file_name,batch_size, !no_validate_wal);`
`981`	`981`	`break;`
`982`	`982`	`caseADD_INSTANCE_CMD:`
`983`		`-returndo_add_instance(instanceState,&instance_config);`
	`983`	`+{`
	`984`	`+PGNodeInfonodeInfo;`
	`985`	`+pgNodeInit(&nodeInfo);`
	`986`	`+instanceState->conn=pgut_connect(dbhost,dbport,dbname,dbuser);`
	`987`	`+check_server_version(instanceState->conn,&nodeInfo);`
	`988`	`+returndo_add_instance(instanceState,&instance_config);`
	`989`	`+}`
`984`	`990`	`caseDELETE_INSTANCE_CMD:`
`985`	`991`	`returndo_delete_instance(instanceState);`
`986`	`992`	`caseINIT_CMD:`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1225,6 +1225,7 @@ extern const char *base36enc_to(long unsigned int value, char buf[ARG_SIZE_HINT`
`1225`	`1225`	`externlong unsignedintbase36dec(constchar*text);`
`1226`	`1226`	`externuint32parse_server_version(constchar*server_version_str);`
`1227`	`1227`	`externuint32parse_program_version(constchar*program_version);`
	`1228`	`+voidcheck_server_version(PGconnconn,PGNodeInfonodeInfo);`
`1228`	`1229`	`externboolparse_page(Pagepage,XLogRecPtr*lsn);`
`1229`	`1230`	`externint32do_compress(voiddst,size_tdst_size,voidconstsrc,size_tsrc_size,`
`1230`	`1231`	`CompressAlgalg,intlevel,constchar**errormsg);`

Comments

(0)