Commitcb1a7e3

committed

add wal-size to backup.control and calculate backup size more accurately

1 parentaaa8941 commitcb1a7e3Copy full SHA for cb1a7e3

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -374,11 +374,12 @@ do_backup_database(parray *backup_list)`
`374`	`374`	`{`
`375`	`375`	`pgFilefile= (pgFile)parray_get(backup_files_list,i);`
`376`	`376`
`377`		`-if (!S_ISREG(file->mode))`
`378`		`-continue;`
	`377`	`+if (S_ISDIR(file->mode))`
	`378`	`+current.data_bytes+=4096;`
`379`	`379`
`380`	`380`	`/* Count the amount of the data actually copied */`
`381`		`-current.data_bytes+=file->write_size;`
	`381`	`+if (S_ISREG(file->mode))`
	`382`	`+current.data_bytes+=file->write_size;`
`382`	`383`	`}`
`383`	`384`
`384`	`385`	`if (backup_files_list)`
`@@ -482,6 +483,13 @@ do_backup(void)`
`482`	`483`	`do_backup_database(backup_list);`
`483`	`484`	`pgut_atexit_pop(backup_cleanup,NULL);`
`484`	`485`
	`486`	`+/* compute size of wal files of this backup stored in the archive */`
	`487`	`+if (!current.stream)`
	`488`	`+{`
	`489`	`+current.wal_bytes=XLOG_SEG_SIZE*`
	`490`	`+(current.stop_lsn/XLogSegSize-current.start_lsn/XLogSegSize+1);`
	`491`	`+}`
	`492`	`+`
`485`	`493`	`/* Backup is done. Update backup status */`
`486`	`494`	`current.end_time=time(NULL);`
`487`	`495`	`current.status=BACKUP_STATUS_DONE;`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,9 @@ pgBackupWriteControl(FILE out, pgBackup backup)`
`427`	`427`	`if (backup->data_bytes!=BYTES_INVALID)`
`428`	`428`	`fprintf(out,"data-bytes = "INT64_FORMAT"\n",backup->data_bytes);`
`429`	`429`
	`430`	`+if (backup->data_bytes!=BYTES_INVALID)`
	`431`	`+fprintf(out,"wal-bytes = "INT64_FORMAT"\n",backup->wal_bytes);`
	`432`	`+`
`430`	`433`	`fprintf(out,"status = %s\n",status2str(backup->status));`
`431`	`434`
`432`	`435`	`/* 'parent_backup' is set if it is incremental backup */`
`@@ -486,6 +489,7 @@ readBackupControlFile(const char *path)`
`486`	`489`	`{'U',0,"recovery-xid",&backup->recovery_xid,SOURCE_FILE_STRICT},`
`487`	`490`	`{'t',0,"recovery-time",&backup->recovery_time,SOURCE_FILE_STRICT},`
`488`	`491`	`{'I',0,"data-bytes",&backup->data_bytes,SOURCE_FILE_STRICT},`
	`492`	`+{'I',0,"wal-bytes",&backup->wal_bytes,SOURCE_FILE_STRICT},`
`489`	`493`	`{'u',0,"block-size",&backup->block_size,SOURCE_FILE_STRICT},`
`490`	`494`	`{'u',0,"xlog-block-size",&backup->wal_block_size,SOURCE_FILE_STRICT},`
`491`	`495`	`{'u',0,"checksum_version",&backup->checksum_version,SOURCE_FILE_STRICT},`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,8 @@ typedef struct pgBackup`
`196`	`196`	`* BYTES_INVALID means nothing was backed up.`
`197`	`197`	`*/`
`198`	`198`	`int64data_bytes;`
	`199`	`+/* Size of WAL files in archive needed to restore this backup */`
	`200`	`+int64wal_bytes;`
`199`	`201`
`200`	`202`	`/* Fields needed for compatibility check */`
`201`	`203`	`uint32block_size;`

Comments

(0)