@@ -58,13 +58,19 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
5858int i ;
5959//parray*dbOid_exclude_list = NULL;
6060
61- /* Check backup version */
61+ /* Check backupprogram version */
6262if (parse_program_version (backup -> program_version )> parse_program_version (PROGRAM_VERSION ))
6363elog (ERROR ,"pg_probackup binary version is %s, but backup %s version is %s. "
6464"pg_probackup do not guarantee to be forward compatible. "
6565"Please upgrade pg_probackup binary." ,
6666PROGRAM_VERSION ,base36enc (backup -> start_time ),backup -> program_version );
6767
68+ /* Check backup server version */
69+ if (strcmp (backup -> server_version ,PG_MAJORVERSION )!= 0 )
70+ elog (ERROR ,"Backup %s has server version %s, but current pg_probackup binary "
71+ "compiled with server version %s" ,
72+ base36enc (backup -> start_time ),backup -> server_version ,PG_MAJORVERSION );
73+
6874if (backup -> status == BACKUP_STATUS_RUNNING )
6975{
7076elog (WARNING ,"Backup %s has status %s, change it to ERROR and skip validation" ,
@@ -120,13 +126,6 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
120126return ;
121127}
122128
123- if (strcmp (backup -> server_version ,PG_MAJORVERSION )!= 0 )
124- {
125- elog (ERROR ,"Backup was made with server version %s, but pg_probackup compiled "
126- "with server version %s." ,
127- backup -> server_version ,PG_MAJORVERSION );
128- }
129-
130129//if (params && params->partial_db_list)
131130//dbOid_exclude_list = get_dbOid_exclude_list(backup, files, params->partial_db_list,
132131//params->partial_restore_type);