Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Issue #313] restore pg_control last #399

Open
wants to merge 6 commits into
base: release_2_5
Choose a base branch
from
Open

[Issue #313] restore pg_control last #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6f3b12
[Issue #313] restore pg_control last
kulaginm Jun 16, 2021
0ef2339
[Issue #313] review feedback
gsmolk Jun 16, 2021
1167c8d
Merge branch 'release_2_5' into release_2_5-issue313
gsmolk Jun 16, 2021
447f0a6
[Issue #313] improve test coverage
gsmolk Jun 16, 2021
3f06d21
allow a failed incremental restore to be restarted
kulaginm Jun 18, 2021
11ef028
[Issue #313] add test incr_restore.IncrRestoreTest.test_incr_restore_…
kulaginm Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/archive.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ do_archive_push(InstanceState *instanceState, InstanceConfig *instance, char *wa
elog(ERROR, "getcwd() error");

/* verify that archive-push --instance parameter is valid */
system_id = get_system_identifier(current_dir);
system_id = get_system_identifier(current_dir, XLOG_CONTROL_FILE, FIO_DB_HOST);

if (instance->pgdata == NULL)
elog(ERROR, "Cannot read pg_probackup.conf for this instance");
Expand Down
2 changes: 1 addition & 1 deletion src/backup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ check_system_identifiers(PGconn *conn, char *pgdata)
uint64 system_id_conn;
uint64 system_id_pgdata;

system_id_pgdata = get_system_identifier(pgdata);
system_id_pgdata = get_system_identifier(pgdata, XLOG_CONTROL_FILE, FIO_DB_HOST);
system_id_conn = get_remote_system_identifier(conn);

/* for checkdb check only system_id_pgdata and system_id_conn */
Expand Down
2 changes: 1 addition & 1 deletion src/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ do_add_instance(InstanceState *instanceState, InstanceConfig *instance)
"(-D, --pgdata)");

/* Read system_identifier from PGDATA */
instance->system_identifier = get_system_identifier(instance->pgdata);
instance->system_identifier = get_system_identifier(instance->pgdata, XLOG_CONTROL_FILE, FIO_DB_HOST);
/* Starting from PostgreSQL 11 read WAL segment size from PGDATA */
instance->xlog_seg_size = get_xlog_seg_size(instance->pgdata);

Expand Down
5 changes: 3 additions & 2 deletions src/pg_probackup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ extern const char *PROGRAM_EMAIL;
#define DATABASE_MAP "database_map"
#define HEADER_MAP "page_header_map"
#define HEADER_MAP_TMP "page_header_map_tmp"
#define XLOG_CONTROL_BAK_FILE XLOG_CONTROL_FILE".pbk.bak"

/* Timeout defaults */
#define ARCHIVE_TIMEOUT_DEFAULT 300
Expand Down Expand Up @@ -1138,12 +1139,12 @@ extern XLogRecPtr get_next_record_lsn(const char *archivedir, XLogSegNo segno, T
extern TimeLineID get_current_timeline(PGconn *conn);
extern TimeLineID get_current_timeline_from_control(bool safe);
extern XLogRecPtr get_checkpoint_location(PGconn *conn);
extern uint64 get_system_identifier(const char *pgdata_path);
extern uint64 get_system_identifier(const char *pgdata_path, const char *pg_control_filename, fio_location location);
extern uint64 get_remote_system_identifier(PGconn *conn);
extern uint32 get_data_checksum_version(bool safe);
extern pg_crc32c get_pgcontrol_checksum(const char *pgdata_path);
extern uint32 get_xlog_seg_size(char *pgdata_path);
extern void get_redo(const char *pgdata_path, RedoParams *redo);
extern void get_redo(const char *pgdata_path, const char *pg_control_filename, RedoParams *redo);
extern void set_min_recovery_point(pgFile *file, const char *backup_path,
XLogRecPtr stop_backup_lsn);
extern void copy_pgcontrol_file(const char *from_fullpath, fio_location from_location,
Expand Down
Loading