db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-02-16 15:18:40 +02:00
Code Issues Releases Activity

Fix validation messages

Browse Source
This commit is contained in:
Artur Zakirov 2017-02-27 15:00:44 +03:00
parent 5bc8d459e0
commit 20e550518c
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parsexlog.c
View File

@ -186,7 +186,7 @@ validate_wal(pgBackup *backup,
/* There are all need WAL records */
if (all_wal)
elog(INFO, "Backup validation stopped on %s time and xid:" XID_FMT,
elog(INFO, "backup validation stopped on time %s and xid " XID_FMT,
last_timestamp, last_xid);
/* There are not need WAL records */
else
@ -223,7 +223,7 @@ validate_wal(pgBackup *backup,
elog(ERROR, "there are no WAL records to xid " XID_FMT,
target_xid);
else if (target_time != 0)
elog(ERROR, "there are no WAL records to time %s ",
elog(ERROR, "there are no WAL records to time %s",
target_timestamp);
}
}

2
pg_probackup.h
View File

@ -287,7 +287,7 @@ extern int do_validate(time_t backup_id,
const char *target_inclusive,
TimeLineID target_tli);
extern void do_validate_last(void);
extern void pgBackupValidate(pgBackup *backup,
extern bool pgBackupValidate(pgBackup *backup,
bool size_only,
bool for_get_timeline);

14
validate.c
View File

@ -36,7 +36,8 @@ do_validate(time_t backup_id,
parray *backups;
pgRecoveryTarget *rt = NULL;
pgBackup *base_backup = NULL;
bool backup_id_found = false;
bool backup_id_found = false,
success_validate;
catalog_lock(false);
@ -101,7 +102,7 @@ base_backup_found:
stream_wal = base_backup->stream;
/* validate base backup */
pgBackupValidate(base_backup, false, false);
success_validate = pgBackupValidate(base_backup, false, false);
last_restored_index = base_index;
@ -143,7 +144,8 @@ base_backup_found:
if (backup_id != 0)
stream_wal = backup->stream;
pgBackupValidate(backup, false, false);
success_validate = success_validate &&
pgBackupValidate(backup, false, false);
last_restored_index = i;
}
@ -154,6 +156,8 @@ base_backup_found:
rt->recovery_target_time,
rt->recovery_target_xid,
base_backup->tli);
else if (success_validate)
elog(INFO, "backup validation stopped successfully");
/* release catalog lock */
catalog_unlock();
@ -168,7 +172,7 @@ base_backup_found:
/*
* Validate each files in the backup with its size.
*/
void
bool
pgBackupValidate(pgBackup *backup,
bool size_only,
bool for_get_timeline)
@ -248,6 +252,8 @@ pgBackupValidate(pgBackup *backup,
else
elog(LOG, "backup %s is valid", backup_id_string);
}
return !corrupted;
}
static const char *