diff --git a/INSTALL.md b/INSTALL.md index 8d511d1c2..c42177e99 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -266,6 +266,8 @@ Restores the latest database backup and then recovers to the `release` restore p **MORE TO BE ADDED HERE** +PITR should start after the stop time in the .backup file. + [reference this when writing about tablespace remapping] http://www.databasesoup.com/2013/11/moving-tablespaces.html diff --git a/lib/BackRest/Backup.pm b/lib/BackRest/Backup.pm index ad9917ea8..5e3d616a2 100644 --- a/lib/BackRest/Backup.pm +++ b/lib/BackRest/Backup.pm @@ -1339,7 +1339,6 @@ sub backup ($strArchiveStart, $strTimestampDbStart) = $oDb->backup_start('pg_backrest backup started ' . $strTimestampStart, $bStartFast); - $oBackupManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_TIMESTAMP_DB_START, undef, $strTimestampDbStart); $oBackupManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_ARCHIVE_START, undef, $strArchiveStart); &log(INFO, "archive start: ${strArchiveStart}"); } @@ -1457,7 +1456,6 @@ sub backup my $strTimestampDbStop; ($strArchiveStop, $strTimestampDbStop) = $oDb->backup_stop(); - $oBackupManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_TIMESTAMP_DB_STOP, undef, $strTimestampDbStop); $oBackupManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_ARCHIVE_STOP, undef, $strArchiveStop); &log(INFO, 'archive stop: ' . $strArchiveStop); diff --git a/lib/BackRest/Manifest.pm b/lib/BackRest/Manifest.pm index fedd9ca3d..f40a83fc7 100644 --- a/lib/BackRest/Manifest.pm +++ b/lib/BackRest/Manifest.pm @@ -24,9 +24,8 @@ our @EXPORT = qw(MANIFEST_PATH MANIFEST_FILE MANIFEST_LINK MANIFEST_SECTION_BACKUP_TABLESPACE MANIFEST_KEY_ARCHIVE_START MANIFEST_KEY_ARCHIVE_STOP MANIFEST_KEY_BASE MANIFEST_KEY_CHECKSUM MANIFEST_KEY_COMPRESS - MANIFEST_KEY_HARDLINK MANIFEST_KEY_LABEL MANIFEST_KEY_PRIOR MANIFEST_KEY_REFERENCE MANIFEST_KEY_TIMESTAMP_DB_START - MANIFEST_KEY_TIMESTAMP_DB_STOP MANIFEST_KEY_TIMESTAMP_COPY_START MANIFEST_KEY_TIMESTAMP_START - MANIFEST_KEY_TIMESTAMP_STOP MANIFEST_KEY_TYPE MANIFEST_KEY_VERSION + MANIFEST_KEY_HARDLINK MANIFEST_KEY_LABEL MANIFEST_KEY_PRIOR MANIFEST_KEY_REFERENCE MANIFEST_KEY_TIMESTAMP_COPY_START + MANIFEST_KEY_TIMESTAMP_START MANIFEST_KEY_TIMESTAMP_STOP MANIFEST_KEY_TYPE MANIFEST_KEY_VERSION MANIFEST_SUBKEY_CHECKSUM MANIFEST_SUBKEY_DESTINATION MANIFEST_SUBKEY_EXISTS MANIFEST_SUBKEY_FUTURE MANIFEST_SUBKEY_GROUP MANIFEST_SUBKEY_LINK MANIFEST_SUBKEY_MODE MANIFEST_SUBKEY_MODIFICATION_TIME @@ -56,8 +55,6 @@ use constant MANIFEST_KEY_LABEL => 'label', MANIFEST_KEY_PRIOR => 'prior', MANIFEST_KEY_REFERENCE => 'reference', - MANIFEST_KEY_TIMESTAMP_DB_START => 'timestamp-db-start', - MANIFEST_KEY_TIMESTAMP_DB_STOP => 'timestamp-db-stop', MANIFEST_KEY_TIMESTAMP_COPY_START => 'timestamp-copy-start', MANIFEST_KEY_TIMESTAMP_START => 'timestamp-start', MANIFEST_KEY_TIMESTAMP_STOP => 'timestamp-stop', @@ -411,8 +408,6 @@ sub valid $strKey eq MANIFEST_KEY_LABEL || $strKey eq MANIFEST_KEY_PRIOR || $strKey eq MANIFEST_KEY_REFERENCE || - $strKey eq MANIFEST_KEY_TIMESTAMP_DB_START || - $strKey eq MANIFEST_KEY_TIMESTAMP_DB_STOP || $strKey eq MANIFEST_KEY_TIMESTAMP_COPY_START || $strKey eq MANIFEST_KEY_TIMESTAMP_START || $strKey eq MANIFEST_KEY_TIMESTAMP_STOP || diff --git a/test/lib/BackRestTest/BackupTest.pm b/test/lib/BackRestTest/BackupTest.pm index c97e2624a..c6173307e 100755 --- a/test/lib/BackRestTest/BackupTest.pm +++ b/test/lib/BackRestTest/BackupTest.pm @@ -1279,10 +1279,6 @@ sub BackRestTestBackup_RestoreCompare ${$oExpectedManifestRef}{'backup'}{'archive-start'}); $oActualManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_ARCHIVE_STOP, undef, ${$oExpectedManifestRef}{'backup'}{'archive-stop'}); - $oActualManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_TIMESTAMP_DB_START, undef, - ${$oExpectedManifestRef}{'backup'}{'timestamp-db-start'}); - $oActualManifest->set(MANIFEST_SECTION_BACKUP, MANIFEST_KEY_TIMESTAMP_DB_STOP, undef, - ${$oExpectedManifestRef}{'backup'}{'timestamp-db-stop'}); } ini_save("${strTestPath}/actual.manifest", $oActualManifest->{oManifest});