Fix validation messages

Artur Zakirov · Artur Zakirov · commit 20e550518c1b · 2017-02-27T15:00:44.000+03:00
diff --git a/parsexlog.c b/parsexlog.c
@@ -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);
 		}
 	}
diff --git a/pg_probackup.h b/pg_probackup.h
@@ -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);
 
diff --git a/validate.c b/validate.c
@@ -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 @@ do_validate(time_t backup_id,
 		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 @@ do_validate(time_t backup_id,
 		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 @@ do_validate(time_t backup_id,
 					 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 @@ do_validate(time_t backup_id,
 /*
  * 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 *
