[pbs-devel] [PATCH proxmox-backup] fix: allow datastore creation in directory with lost+found directory

[pbs-devel] [PATCH proxmox-backup] fix: allow datastore creation in directory with lost+found directory

[Gabriel Goller]

When creating a datastore without the "reuse-datastore" option and the
datastore contains a `lost+found` directory (which is quite common), the
creation fails. Add `lost+found` to the ignore list.

Reported here: https://forum.proxmox.com/threads/bug-when-adding-new-storage-task-error-datastore-path-is-not-empty.157629/#post-721733

Fixes: 6e101ff75777 ("fix #5439: allow to reuse existing datastore")
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
 src/api2/config/datastore.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index 374c302fcf28..f3bf652cda76 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -89,7 +89,9 @@ pub(crate) fn do_create_datastore(
         if let Ok(dir) = std::fs::read_dir(&path) {
             for file in dir {
                 let name = file?.file_name();
-                if !name.to_str().map_or(false, |name| name.starts_with('.')) {
+                if !name.to_str().map_or(false, |name| {
+                    name.starts_with('.') || name.starts_with("lost+found")
+                }) {
                     bail!("datastore path is not empty");
                 }
             }
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

Re: [pbs-devel] [PATCH proxmox-backup] fix: allow datastore creation in directory with lost+found directory

[Fiona Ebner]

Am 19.11.24 um 17:17 schrieb Gabriel Goller:
> When creating a datastore without the "reuse-datastore" option and the
> datastore contains a `lost+found` directory (which is quite common), the
> creation fails. Add `lost+found` to the ignore list.
> 
> Reported here: https://forum.proxmox.com/threads/bug-when-adding-new-storage-task-error-datastore-path-is-not-empty.157629/#post-721733
> 
> Fixes: 6e101ff75777 ("fix #5439: allow to reuse existing datastore")
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
>  src/api2/config/datastore.rs | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
> index 374c302fcf28..f3bf652cda76 100644
> --- a/src/api2/config/datastore.rs
> +++ b/src/api2/config/datastore.rs
> @@ -89,7 +89,9 @@ pub(crate) fn do_create_datastore(
>          if let Ok(dir) = std::fs::read_dir(&path) {
>              for file in dir {
>                  let name = file?.file_name();
> -                if !name.to_str().map_or(false, |name| name.starts_with('.')) {
> +                if !name.to_str().map_or(false, |name| {
> +                    name.starts_with('.') || name.starts_with("lost+found")

Nit: while it shouldn't make much difference in practice, why use
starts_with()? Exact checking would seem more natural to me for this.


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

Re: [pbs-devel] [PATCH proxmox-backup] fix: allow datastore creation in directory with lost+found directory

[Gabriel Goller]

On 20.11.2024 11:19, Fiona Ebner wrote:
>Am 19.11.24 um 17:17 schrieb Gabriel Goller:
>> When creating a datastore without the "reuse-datastore" option and the
>> datastore contains a `lost+found` directory (which is quite common), the
>> creation fails. Add `lost+found` to the ignore list.
>>
>> Reported here: https://forum.proxmox.com/threads/bug-when-adding-new-storage-task-error-datastore-path-is-not-empty.157629/#post-721733
>>
>> Fixes: 6e101ff75777 ("fix #5439: allow to reuse existing datastore")
>> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
>> ---
>>  src/api2/config/datastore.rs | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
>> index 374c302fcf28..f3bf652cda76 100644
>> --- a/src/api2/config/datastore.rs
>> +++ b/src/api2/config/datastore.rs
>> @@ -89,7 +89,9 @@ pub(crate) fn do_create_datastore(
>>          if let Ok(dir) = std::fs::read_dir(&path) {
>>              for file in dir {
>>                  let name = file?.file_name();
>> -                if !name.to_str().map_or(false, |name| name.starts_with('.')) {
>> +                if !name.to_str().map_or(false, |name| {
>> +                    name.starts_with('.') || name.starts_with("lost+found")
>
>Nit: while it shouldn't make much difference in practice, why use
>starts_with()? Exact checking would seem more natural to me for this.

Actually no idea :)

Will submit a v2 with Eq.


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel