The backup drive keeps deleted files for 30 days, then removes them (#999)

* The backup drive keeps deleted files for 30 days, then removes them

The fifth part of replacing the sync.  A backup drive never deleted anything, so it grew forever and kept every file
the media directory had ever held.  Now, like a secondary:

- A file deleted from the media directory, or the old version of one that changed, is moved to a dated folder in
  .backup-trash on the backup drive.  Folders older than backup_delete_after_days (sync.yaml; 30 by default, also
  for drives set up before this; none never deletes) are removed, before and after each backup, and the oldest go
  sooner when the drive is nearly full.
- A backup refuses a media directory that is not mounted, or has no config/wrolpi.yaml: copied with deletes, an
  empty folder would move the whole backup drive to the trash.
- The Backup Drive panel has the same "Delete after N days / Never delete them" control as the Sync panel, now one
  component, and refuses an empty number of days.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* A nearly full drive keeps the trash it just filled, and makes room for the database

Review found, in the backup drive's trash and in the secondary's sync, which share its shape:

- Below 1 GiB free, the purge after a copy removed the newest trash folder too.  Moving a file to the trash is a
  rename, which frees nothing, so on a nearly full drive a deleted file was gone at the end of the same run instead
  of 30 days later.  The newest folder is now only removed by age (0 days still deletes at once).
- The purge made room only down to 1 GiB, so a database larger than the free space failed to be copied every time
  while the trash was full.  Before the database is written (the backup's snapshot, the secondary's copy of its
  primary's), the trash now makes room for the whole database.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
lrnselfreliance 2026-11-19 16:50:21 -07:00 • committed by GitHub
parent 38885990f6
commit a5ab01198b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 345 additions and 50 deletions

View file

@ -300,6 +300,34 @@ export function ExcludedDirectories({value, onChange, source, disabled, note}) {
</div>
}
/** True if `days` (a number, or the text of the days box) is a whole number of days. */
export function validDays(days) {
return /^\d+$/.test(String(days ?? '').trim());
}
/**
* How long deleted files wait in a trash folder before they are removed; `value` null is "never". An empty box is
* not "delete at once": callers refuse to save it (see `validDays`).
*/
export function DeleteDelay({label, value, onChange, disabled, description}) {
const never = value === null;
return <div style={{margin: '0.5em 0'}}>
<label><b>{label}</b></label>
<div style={{display: 'flex', gap: '1em', alignItems: 'center', flexWrap: 'wrap'}}>
<span style={{display: 'flex', gap: '0.5em', alignItems: 'center'}}>
Delete after
<TextInput type='number' min={0} max={3650} style={{width: '6em'}} aria-label={`${label}: days`}
value={never ? '' : value} disabled={disabled || never}
onChange={e => onChange(e.currentTarget.value)}/>
days
</span>
<Checkbox checked={never} disabled={disabled} label='Never delete them'
aria-label={`${label}: never delete them`} onChange={() => onChange(never ? 30 : null)}/>
</div>
<p style={{color: 'var(--muted)', fontSize: '0.9em'}}>{description}</p>
</div>
}
export function SyncSection() {
const {settings, fetchSettings} = React.useContext(SettingsContext);
const {sync, running, fetchSync} = useSyncStatus();
@ -341,7 +369,7 @@ export function SyncSection() {
const save = async () => {
// An empty box is not "delete at once": that would empty the trash at the next sync.
const days = String(state.sync_delete_after_days ?? '').trim();
if (secondary && !neverDelete && !/^\d+$/.test(days)) {
if (secondary && !neverDelete && !validDays(days)) {
toast({
type: 'error', title: 'Sync settings were not saved', time: 5000,
description: 'Enter how many days to keep deleted files, or choose to never delete them.',
@ -420,25 +448,11 @@ export function SyncSection() {
Within the window, this secondary syncs every 15 minutes. Leave both empty to sync only with
"Sync Now".
</p>
<div style={{margin: '0.5em 0'}}>
<label><b>Files the primary deletes</b></label>
<div style={{display: 'flex', gap: '1em', alignItems: 'center', flexWrap: 'wrap'}}>
<span style={{display: 'flex', gap: '0.5em', alignItems: 'center'}}>
Delete after
<TextInput type='number' min={0} max={3650} style={{width: '6em'}} aria-label='Days'
value={neverDelete ? '' : state.sync_delete_after_days}
disabled={wrolMode || neverDelete}
onChange={e => setState({...state, sync_delete_after_days: e.currentTarget.value})}/>
days
</span>
<Checkbox checked={neverDelete} disabled={wrolMode} label='Never delete them'
onChange={() => setState({...state, sync_delete_after_days: neverDelete ? 30 : null})}/>
</div>
<p style={{color: 'var(--muted)', fontSize: '0.9em'}}>
A file the primary deletes, or the old version of one it changes, waits in a trash folder
(<code>.sync-trash</code>) for this long. It is removed sooner if the drive is nearly full.
</p>
</div>
<DeleteDelay label='Files the primary deletes' value={state.sync_delete_after_days} disabled={wrolMode}
onChange={value => setState({...state, sync_delete_after_days: value})}
description={<>A file the primary deletes, or the old version of one it changes, waits in a
trash folder (<code>.sync-trash</code>) for this long. It is removed sooner if the drive
is nearly full.</>}/>
</>}
{/* The primary's folders can only be listed once this WROLPi knows its primary. */}
@ -531,6 +545,7 @@ export function BackupDriveSection() {
const [windowStart, setWindowStart] = React.useState('');
const [windowEnd, setWindowEnd] = React.useState('');
const [excluded, setExcluded] = React.useState([]);
const [deleteAfterDays, setDeleteAfterDays] = React.useState(30);
const [saving, setSaving] = React.useState(false);
const savedDirectory = settings?.backup_directory || '';
@ -554,6 +569,12 @@ export function BackupDriveSection() {
setExcluded(JSON.parse(savedExcluded));
}, [savedExcluded]);
// null: never delete.
const savedDeleteAfterDays = settings?.backup_delete_after_days;
React.useEffect(() => {
setDeleteAfterDays(savedDeleteAfterDays === undefined ? 30 : savedDeleteAfterDays);
}, [savedDeleteAfterDays]);
React.useEffect(() => {
if (dockerized === false) {
getDisks().then(setDisks).catch(e => setDisksError(e.message));
@ -573,6 +594,13 @@ export function BackupDriveSection() {
const running = status?.flags?.backup_running === true;
const save = async () => {
if (drive && deleteAfterDays !== null && !validDays(deleteAfterDays)) {
toast({
type: 'error', title: 'Backup drive was not saved', time: 5000,
description: 'Enter how many days to keep deleted files, or choose to never delete them.',
});
return;
}
setSaving(true);
try {
const chosen = options.find(i => i.value === drive);
@ -583,6 +611,8 @@ export function BackupDriveSection() {
backup_window_start: chosen ? windowStart : '',
backup_window_end: chosen ? windowEnd : '',
backup_excluded_directories: excluded,
// The API takes -1 for "never".
backup_delete_after_days: deleteAfterDays === null ? -1 : Number(String(deleteAfterDays).trim()),
});
if (response?.ok) {
toast({type: 'success', title: 'Backup drive saved', time: 3000});
@ -605,7 +635,8 @@ export function BackupDriveSection() {
<Header as='h3' icon='hdd'>Backup Drive</Header>
<p>
Copy this WROLPi's media directory to a second drive, so the drive can replace the media drive if it
fails. Files deleted here are kept on the backup drive.
fails. A file deleted here, or the old version of one that changes, is kept on the backup drive for as
long as you choose below.
</p>
{disksError && <Message kind='error' icon='warning' title='Could not list drives'>{disksError}</Message>}
<div style={{margin: '0.5em 0', maxWidth: '30em'}}>
@ -638,6 +669,11 @@ export function BackupDriveSection() {
Within the window, the backup drive is updated every hour. Leave both empty to back up only with
"Back Up Now".
</p>
<DeleteDelay label='Files deleted here' value={deleteAfterDays} onChange={setDeleteAfterDays}
disabled={wrolMode}
description={<>A file deleted from this WROLPi, or the old version of one that changes,
waits on the backup drive in a trash folder (<code>.backup-trash</code>) for this long.
It is removed sooner if the backup drive is nearly full.</>}/>
<ExcludedDirectories value={excluded} onChange={setExcluded} source='local' disabled={wrolMode}/>
</>}
<div style={{display: 'flex', gap: '0.5em', flexWrap: 'wrap'}}>

View file

@ -168,10 +168,10 @@ describe('SyncSection', () => {
it('saves how long deleted files are kept, or never to delete them', async () => {
renderWithProviders(<SyncSection/>, {settings: secondary({sync_delete_after_days: 7})});
expect(screen.getByLabelText('Days')).toHaveValue(7);
expect(screen.getByLabelText('Files the primary deletes: days')).toHaveValue(7);
fireEvent.click(screen.getByLabelText('Never delete them'));
expect(screen.getByLabelText('Days')).toBeDisabled();
fireEvent.click(screen.getByLabelText('Files the primary deletes: never delete them'));
expect(screen.getByLabelText('Files the primary deletes: days')).toBeDisabled();
fireEvent.click(screen.getByText('Save'));
await waitFor(() => expect(saveSyncSettings).toHaveBeenCalledWith(
expect.objectContaining({sync_delete_after_days: -1})));
@ -179,13 +179,13 @@ describe('SyncSection', () => {
it('an empty number of days is not saved as "delete at once"', async () => {
renderWithProviders(<SyncSection/>, {settings: secondary({sync_delete_after_days: 30})});
fireEvent.change(screen.getByLabelText('Days'), {target: {value: ''}});
fireEvent.change(screen.getByLabelText('Files the primary deletes: days'), {target: {value: ''}});
fireEvent.click(screen.getByText('Save'));
await waitFor(() => expect(toast).toHaveBeenCalledWith(expect.objectContaining({
type: 'error', title: 'Sync settings were not saved'})));
expect(saveSyncSettings).not.toHaveBeenCalled();
fireEvent.change(screen.getByLabelText('Days'), {target: {value: '0'}});
fireEvent.change(screen.getByLabelText('Files the primary deletes: days'), {target: {value: '0'}});
fireEvent.click(screen.getByText('Save'));
await waitFor(() => expect(saveSyncSettings).toHaveBeenCalledWith(
expect.objectContaining({sync_delete_after_days: 0})));
@ -193,7 +193,7 @@ describe('SyncSection', () => {
it('a secondary that never deletes shows it', () => {
renderWithProviders(<SyncSection/>, {settings: secondary({sync_delete_after_days: null})});
expect(screen.getByLabelText('Never delete them')).toBeChecked();
expect(screen.getByLabelText('Files the primary deletes: never delete them')).toBeChecked();
});
it('WROL Mode stops syncing', () => {
@ -221,9 +221,31 @@ describe('BackupDriveSection', () => {
await waitFor(() => expect(saveSyncSettings).toHaveBeenCalledWith({
backup_directory: '/media/wrolpi_backup', backup_device_uuid: 'uuid-backup',
backup_window_start: '', backup_window_end: '', backup_excluded_directories: [],
backup_delete_after_days: 30,
}));
});
it('saves how long deleted files are kept on the backup drive', async () => {
const settings = {settings: settingsFixture({
backup_directory: '/media/wrolpi_backup', backup_device_uuid: 'uuid-backup',
backup_delete_after_days: 7})};
renderWithProviders(<BackupDriveSection/>, {settings});
const days = await screen.findByLabelText('Files deleted here: days');
expect(days).toHaveValue(7);
// An empty box is not "delete at once".
fireEvent.change(days, {target: {value: ''}});
fireEvent.click(screen.getByText('Save'));
await waitFor(() => expect(toast).toHaveBeenCalledWith(expect.objectContaining({
type: 'error', title: 'Backup drive was not saved'})));
expect(saveSyncSettings).not.toHaveBeenCalled();
fireEvent.click(screen.getByLabelText('Files deleted here: never delete them'));
fireEvent.click(screen.getByText('Save'));
await waitFor(() => expect(saveSyncSettings).toHaveBeenCalledWith(
expect.objectContaining({backup_delete_after_days: -1})));
});
it('shows the backup and runs it on request', async () => {
const settings = {settings: settingsFixture({backup_directory: '/media/wrolpi_backup',
backup_device_uuid: 'uuid-backup'})};
@ -299,6 +321,7 @@ describe('BackupDriveSection folder', () => {
await waitFor(() => expect(saveSyncSettings).toHaveBeenCalledWith({
backup_directory: '/media/wrolpi_backup/wrolpi/library', backup_device_uuid: 'uuid-backup',
backup_window_start: '', backup_window_end: '', backup_excluded_directories: [],
backup_delete_after_days: 30,
}));
});
@ -334,6 +357,7 @@ describe('BackupDriveSection window', () => {
await waitFor(() => expect(saveSyncSettings).toHaveBeenCalledWith({
backup_directory: '/media/wrolpi_backup', backup_device_uuid: 'uuid-backup',
backup_window_start: '01:00', backup_window_end: '04:30', backup_excluded_directories: [],
backup_delete_after_days: 30,
}));
});
});