[pbs-devel] [PATCH proxmox-backup] fix #3336: api: remove backup group if the last snapshot is removed

Thomas Lamprecht t.lamprecht at proxmox.com
Mon Mar 14 11:19:26 CET 2022

On 14.03.22 10:36, Wolfgang Bumiller wrote:
> On Fri, Mar 11, 2022 at 01:20:22PM +0100, Thomas Lamprecht wrote:
>> On 09.03.22 14:50, Stefan Sterz wrote:
>>> Signed-off-by: Stefan Sterz <s.sterz at proxmox.com>
>>> ---
>>>  pbs-datastore/src/datastore.rs | 22 ++++++++++++++++++++++
>>>  1 file changed, 22 insertions(+)
>>> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
>>> index d416c8d8..623b7688 100644
>>> --- a/pbs-datastore/src/datastore.rs
>>> +++ b/pbs-datastore/src/datastore.rs
>>> @@ -346,6 +346,28 @@ impl DataStore {
>>>                  )
>>>              })?;
>>> +        // check if this was the last snapshot and if so remove the group
>>> +        if backup_dir
>>> +            .group()
>>> +            .list_backups(&self.base_path())?
>>> +            .is_empty()
>>> +        {
>> a log::info could be appropriate in the "success" (i.e., delete dir) case.
>> I'd factor the this block below out into a non-pub (or pub(crate)) remove_empty_group_dir fn.
>>> +            let group_path = self.group_path(backup_dir.group());
>>> +            let _guard = proxmox_sys::fs::lock_dir_noblock(
>>> +                &group_path,
>>> +                "backup group",
>>> +                "possible running backup",
>>> +            )?;
>>> +
>>> +            std::fs::remove_dir_all(&group_path).map_err(|err| {
>> this is still unsafe as there's a TOCTOU race, the lock does not protects you from the
>> following sequence with two threads/async-excutions t1 and t1
>> t1.1 snapshot deleted
>> t1.2 empty dir check holds up, entering "delete group dir" code branch
>> t2.1                                        create new snapshot in group -> lock group dir
>> t2.2                                        finish new snapshot in group -> unlock group dir
>> t1.3 lock group dir
>> t1.4 delete all files, including the new snapshot made in-between.
>> Rather, just use the safer "remove_dir" variant, that way the TOCTOU race doesn't matters,
>> the check merely becomes a short cut; if we'd explicitly check for
>>   `err.kind() != ErrorKind::DirectoryNotEmpty
>> and silent it we could even do away with the check, should result in the same amount of
>> syscalls in the best-case (one rmdir vs. one readir) and can be better on success
>> (readdir + rmdir vs. rmdir only), not that perfromance matters much in this case.
>> fyi, "remove_backup_group", the place where I think you copied this part, can use the
>> remove_dir_all safely because there's no check to made there, so no TOCTOU.
> Correct me if I'm wrong, but I think we need to rethink our locking
> there in general. We can't lock the directory itself if we also want to
> be allowed to delete it (same reasoning as with regular files):
> -> A locks backup group
>     -> B begins locking: opens dir handle
> -> A deletes group, group is now gone
>         -> C recreates the backup group, _locked_
> -> A drops directory handle (& with it the lock)
>     -> B acquries lock on deleted directory handle which works just fine
> now B and C both think they're holding an exlusive lock

hmm, reads as "can really happen" to me.

> We *could* use a lock helper that also stats before and after the lock
> (on the handle first, then on the *path* for the second one) to see if
> the inode changed, to catch this...
> Or we just live with empty directories or (hidden) lock files lingering.
> (which would only be safe to clean up during a maintenance mode
> operation).
> Or we introduce a create/delete lock one level up, held only for the
> duration of mkdir()/rmdir() calls.

Or fstat the lock fd after and check for st_nlink > 0 to determine if it's
still existing (i.e., not deleted).

Or move locking into a tmpfs backed per-datastore directory, e.g. in run or
a separate mounted one, which would give several benefits:

 1. independent of FS issues w.r.t. flock like especially network FSs
    sometimes have
 2. faster locking as we won't produce (metadata) IO to a real block dev
 3. making locks independent of the actual datastore, avoiding above issue

Only thing we would need to check is setting the tmpfs inode count high
enough and avoid inode-per-directory limits, as we probably want to have
the locks flattened to a single hierarchy (avoids directory creation/owner
issues), at least if that's a problem at all for tmpfs (total inode count
for sure can be)

> (But in any case, all the current inline `lock_dir_noblock` calls should
> instead go over a safe helper dealing with this properly...)

More information about the pbs-devel mailing list