db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-22 11:44:34 +02:00
Code Issues Releases Activity

remove duration variable as unrelated to this feature,

Browse Source 
code cleanup.
This commit is contained in:
Anastasia 2019-06-11 18:34:10 +03:00
parent 6f2d3f5cc5
commit 8ea9bcac87
3 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backup.c
View File

@ -1992,8 +1992,6 @@ backup_files(void *arg)
if ((difftime(time(NULL), prev_time)) > 10)
{
prev_time = time(NULL);
elog(INFO, "write_backup_filelist N=%d, starttime %ld, time %ld",
n_backup_files_list, current.start_time, prev_time);
write_backup_filelist(&current, arguments->files_list, instance_config.pgdata,
arguments->external_dirs);

37
src/catalog.c
View File

@ -91,31 +91,6 @@ write_backup_status(pgBackup *backup, BackupStatus status)
pgBackupFree(tmp);
}
/* update some fields of backup control file */
void
write_backup_control_on_the_fly(pgBackup *backup)
{
pgBackup *tmp;
tmp = read_backup(backup->start_time);
if (!tmp)
{
/*
* Silently exit the function, since read_backup already logged the
* warning message.
*/
return;
}
tmp->status = backup->status;
tmp->data_bytes = backup->data_bytes;
backup->duration = difftime(time(NULL), backup->start_time);
tmp->duration = backup->duration;
write_backup(tmp);
pgBackupFree(tmp);
}
/*
* Create exclusive lockfile in the backup's directory.
*/
@ -610,8 +585,6 @@ pgBackupWriteControl(FILE *out, pgBackup *backup)
/* print external directories list */
if (backup->external_dir_str)
fio_fprintf(out, "external-dirs = '%s'\n", backup->external_dir_str);
fio_fprintf(out, "duration = " INT64_FORMAT "\n", backup->duration);
}
/*
@ -687,11 +660,10 @@ write_backup_filelist(pgBackup *backup, parray *files, const char *root,
i++;
/* if file is not backuped yet, do not add it to the list */
/* TODO check that we correctly handle files which disappeared during backups */
if (!file->backuped)
{
elog(WARNING, "file not backuped %s", file->rel_path);
continue;
}
if (S_ISDIR(file->mode))
backup_size_on_disk += 4096;
@ -778,7 +750,7 @@ write_backup_filelist(pgBackup *backup, parray *files, const char *root,
/* use extra variable to avoid reset of previous data_bytes value in case of error */
backup->data_bytes = backup_size_on_disk;
write_backup_control_on_the_fly(backup);
write_backup(backup);
}
/*
@ -826,7 +798,6 @@ readBackupControlFile(const char *path)
{'b', 0, "from-replica", &backup->from_replica, SOURCE_FILE_STRICT},
{'s', 0, "primary-conninfo", &backup->primary_conninfo, SOURCE_FILE_STRICT},
{'s', 0, "external-dirs", &backup->external_dir_str, SOURCE_FILE_STRICT},
{'I', 0, "duration", &backup->duration, SOURCE_FILE_STRICT},
{0}
};
@ -1058,8 +1029,6 @@ pgBackupInit(pgBackup *backup)
backup->program_version[0] = '\0';
backup->server_version[0] = '\0';
backup->external_dir_str = NULL;
backup->duration = (time_t) 0;
}
/* free pgBackup object */

4
src/pg_probackup.h
View File

@ -310,8 +310,6 @@ struct pgBackup
* in the format suitable for recovery.conf */
char *external_dir_str; /* List of external directories,
* separated by ':' */
int64 duration; /* TODO write better comment. time(NULL)-start_time */
};
/* Recovery target for restore and validate subcommands */
@ -549,7 +547,7 @@ extern int do_validate_all(void);
extern pgBackup *read_backup(time_t timestamp);
extern void write_backup(pgBackup *backup);
extern void write_backup_status(pgBackup *backup, BackupStatus status);
extern void write_backup_control_on_the_fly(pgBackup *backup);
extern void write_backup_data_bytes(pgBackup *backup);
extern bool lock_backup(pgBackup *backup);
extern const char *pgBackupGetBackupMode(pgBackup *backup);