db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

[Issue #169] Minor improvements

Browse Source
This commit is contained in:
Grigory Smolkin
2020-01-26 22:04:07 +03:00
parent bf5b8f6b48
commit c0541a6068
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/restore.c
+17 -18
View File
@@ -497,7 +497,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
} }
/* cleanup */ /* cleanup */
parray_walk(backups, pgBackupFree); /* TODO: free backup->files */ parray_walk(backups, pgBackupFree);
parray_free(backups); parray_free(backups);
parray_free(parent_chain); parray_free(parent_chain);
@@ -529,29 +529,19 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
/* Preparations for actual restoring */ /* Preparations for actual restoring */
time2iso(timestamp, lengthof(timestamp), dest_backup->start_time); time2iso(timestamp, lengthof(timestamp), dest_backup->start_time);
elog(LOG, "Restoring database from backup at %s", timestamp); elog(INFO, "Restoring the database from backup at %s", timestamp);
join_path_components(control_file, dest_backup->root_dir, DATABASE_FILE_LIST); join_path_components(control_file, dest_backup->root_dir, DATABASE_FILE_LIST);
dest_files = dir_read_file_list(NULL, NULL, control_file, FIO_BACKUP_HOST); dest_files = dir_read_file_list(NULL, NULL, control_file, FIO_BACKUP_HOST);
// TODO lock entire chain /* Lock backup chain and make sanity checks */
// for (i = parray_num(parent_chain) - 1; i >= 0; i--)
// {
// pgBackup *backup = (pgBackup *) parray_get(parent_chain, i);
//
// /*
// * Backup was locked during validation if no-validate wasn't
// * specified.
// */
// if (params->no_validate && !lock_backup(backup))
// elog(ERROR, "Cannot lock backup directory");
//
// restore_backup(backup, dest_external_dirs, dest_files, dbOid_exclude_list, params);
// }
for (i = parray_num(parent_chain) - 1; i >= 0; i--) for (i = parray_num(parent_chain) - 1; i >= 0; i--)
{ {
pgBackup *backup = (pgBackup *) parray_get(parent_chain, i); pgBackup *backup = (pgBackup *) parray_get(parent_chain, i);
if (!lock_backup(backup))
elog(ERROR, "Cannot lock backup %s", base36enc(backup->start_time));
if (backup->status != BACKUP_STATUS_OK && if (backup->status != BACKUP_STATUS_OK &&
backup->status != BACKUP_STATUS_DONE) backup->status != BACKUP_STATUS_DONE)
{ {
@@ -638,6 +628,10 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
pg_atomic_clear_flag(&file->lock); pg_atomic_clear_flag(&file->lock);
} }
/*
* Close ssh connection belonging to the main thread
* to avoid the possibility of been killed for idleness
*/
fio_disconnect(); fio_disconnect();
threads = (pthread_t *) palloc(sizeof(pthread_t) * num_threads); threads = (pthread_t *) palloc(sizeof(pthread_t) * num_threads);
@@ -735,8 +729,13 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
if (external_dirs != NULL) if (external_dirs != NULL)
free_dir_list(external_dirs); free_dir_list(external_dirs);
parray_walk(dest_files, pgFileFree); for (i = parray_num(parent_chain) - 1; i >= 0; i--)
parray_free(dest_files); {
pgBackup *backup = (pgBackup *) parray_get(parent_chain, i);
parray_walk(backup->files, pgFileFree);
parray_free(backup->files);
}
} }
/* /*