Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 20e5505

Browse files
author
Artur Zakirov
committed
Fix validation messages
1 parent 5bc8d45 commit 20e5505

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

parsexlog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ validate_wal(pgBackup *backup,
186186

187187
/* There are all need WAL records */
188188
if (all_wal)
189-
elog(INFO, "Backup validation stopped on %s time and xid:" XID_FMT,
189+
elog(INFO, "backup validation stopped on time %s and xid " XID_FMT,
190190
last_timestamp, last_xid);
191191
/* There are not need WAL records */
192192
else
@@ -223,7 +223,7 @@ validate_wal(pgBackup *backup,
223223
elog(ERROR, "there are no WAL records to xid " XID_FMT,
224224
target_xid);
225225
else if (target_time != 0)
226-
elog(ERROR, "there are no WAL records to time %s ",
226+
elog(ERROR, "there are no WAL records to time %s",
227227
target_timestamp);
228228
}
229229
}

pg_probackup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ extern int do_validate(time_t backup_id,
287287
const char *target_inclusive,
288288
TimeLineID target_tli);
289289
extern void do_validate_last(void);
290-
extern void pgBackupValidate(pgBackup *backup,
290+
extern bool pgBackupValidate(pgBackup *backup,
291291
bool size_only,
292292
bool for_get_timeline);
293293

validate.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ do_validate(time_t backup_id,
3636
parray *backups;
3737
pgRecoveryTarget *rt = NULL;
3838
pgBackup *base_backup = NULL;
39-
bool backup_id_found = false;
39+
bool backup_id_found = false,
40+
success_validate;
4041

4142
catalog_lock(false);
4243

@@ -101,7 +102,7 @@ do_validate(time_t backup_id,
101102
stream_wal = base_backup->stream;
102103

103104
/* validate base backup */
104-
pgBackupValidate(base_backup, false, false);
105+
success_validate = pgBackupValidate(base_backup, false, false);
105106

106107
last_restored_index = base_index;
107108

@@ -143,7 +144,8 @@ do_validate(time_t backup_id,
143144
if (backup_id != 0)
144145
stream_wal = backup->stream;
145146

146-
pgBackupValidate(backup, false, false);
147+
success_validate = success_validate &&
148+
pgBackupValidate(backup, false, false);
147149
last_restored_index = i;
148150
}
149151

@@ -154,6 +156,8 @@ do_validate(time_t backup_id,
154156
rt->recovery_target_time,
155157
rt->recovery_target_xid,
156158
base_backup->tli);
159+
else if (success_validate)
160+
elog(INFO, "backup validation stopped successfully");
157161

158162
/* release catalog lock */
159163
catalog_unlock();
@@ -168,7 +172,7 @@ do_validate(time_t backup_id,
168172
/*
169173
* Validate each files in the backup with its size.
170174
*/
171-
void
175+
bool
172176
pgBackupValidate(pgBackup *backup,
173177
bool size_only,
174178
bool for_get_timeline)
@@ -248,6 +252,8 @@ pgBackupValidate(pgBackup *backup,
248252
else
249253
elog(LOG, "backup %s is valid", backup_id_string);
250254
}
255+
256+
return !corrupted;
251257
}
252258

253259
static const char *

0 commit comments

Comments
 (0)