[pve-devel] [PATCH manager] pve8to9: don't report already migrated files as needing to be migrated

[pve-devel] [PATCH manager] pve8to9: don't report already migrated files as needing to be migrated

[Shannon Sterz]

the find command previously also found the already migrated rrd files
under `pve-{vm,node,storage}-9.0` and reported them as needing to
migrate them. the provided command to would of course not migrate them
so the warning persisted even after the command was run.

limit the find command to the old `pve2-` prefixed folders to prevent
that.

Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
 PVE/CLI/pve8to9.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
index 4d61cd831..834432b95 100644
--- a/PVE/CLI/pve8to9.pm
+++ b/PVE/CLI/pve8to9.pm
@@ -1880,7 +1880,17 @@ sub check_rrd_migration {
         };
         eval {
             run_command(
-                ['find', '/var/lib/rrdcached/db', '-type', 'f', '!', '-name', '*.old'],
+                [
+                    'find',
+                    '/var/lib/rrdcached/db',
+                    '-path',
+                    '*pve2-*',
+                    '-type',
+                    'f',
+                    '!',
+                    '-name',
+                    '*.old',
+                ],
                 outfunc => $count_occurences,
                 noerr => 1,
             );
-- 
2.47.2



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

Re: [pve-devel] [PATCH manager] pve8to9: don't report already migrated files as needing to be migrated

[Michael Köppl]

Gave this a quick spin, since I was just encountering this while
upgrading some nodes for testing. Running the pve8to9 script before
running the migration, the script reported some rrd files had not yet
been migrated, as expected. After migrating the files, as suggested by
the warning message, the warning was not displayed anymore. Looks good
to me.

Consider this:
Tested-by: Michael Köppl <m.koeppl@proxmox.com>

On 8/1/25 11:13, Shannon Sterz wrote:
> the find command previously also found the already migrated rrd files
> under `pve-{vm,node,storage}-9.0` and reported them as needing to
> migrate them. the provided command to would of course not migrate them
> so the warning persisted even after the command was run.
> 
> limit the find command to the old `pve2-` prefixed folders to prevent
> that.
> 
> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
> ---
>  PVE/CLI/pve8to9.pm | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
> index 4d61cd831..834432b95 100644
> --- a/PVE/CLI/pve8to9.pm
> +++ b/PVE/CLI/pve8to9.pm
> @@ -1880,7 +1880,17 @@ sub check_rrd_migration {
>          };
>          eval {
>              run_command(
> -                ['find', '/var/lib/rrdcached/db', '-type', 'f', '!', '-name', '*.old'],
> +                [
> +                    'find',
> +                    '/var/lib/rrdcached/db',
> +                    '-path',
> +                    '*pve2-*',
> +                    '-type',
> +                    'f',
> +                    '!',
> +                    '-name',
> +                    '*.old',
> +                ],
>                  outfunc => $count_occurences,
>                  noerr => 1,
>              );



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

Re: [pve-devel] [PATCH manager] pve8to9: don't report already migrated files as needing to be migrated

[Shannon Sterz]

On Fri Aug 1, 2025 at 11:13 AM CEST, Shannon Sterz wrote:
> the find command previously also found the already migrated rrd files
> under `pve-{vm,node,storage}-9.0` and reported them as needing to
> migrate them. the provided command to would of course not migrate them
> so the warning persisted even after the command was run.
>
> limit the find command to the old `pve2-` prefixed folders to prevent
> that.
>
> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
> ---
>  PVE/CLI/pve8to9.pm | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
> index 4d61cd831..834432b95 100644
> --- a/PVE/CLI/pve8to9.pm
> +++ b/PVE/CLI/pve8to9.pm
> @@ -1880,7 +1880,17 @@ sub check_rrd_migration {
>          };
>          eval {
>              run_command(
> -                ['find', '/var/lib/rrdcached/db', '-type', 'f', '!', '-name', '*.old'],
> +                [
> +                    'find',
> +                    '/var/lib/rrdcached/db',
> +                    '-path',
> +                    '*pve2-*',
> +                    '-type',
> +                    'f',
> +                    '!',
> +                    '-name',
> +                    '*.old',
> +                ],
>                  outfunc => $count_occurences,
>                  noerr => 1,
>              );

I guess this should have had the following added:

Reported-by: Friedrich Weber <f.weber@proxmoc.com>
Reported-by: Daniel Herzig <d.herzig@proxmox.com>

as both have reported this issue independently from me



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

Re: [pve-devel] [PATCH manager] pve8to9: don't report already migrated files as needing to be migrated

[Daniel Herzig]

Thanks, this removes the warnings after upgrading on my systems.

Tested-by: Daniel Herzig <d.herzig@proxmox.com>

On 8/1/25 11:13, Shannon Sterz wrote:
> the find command previously also found the already migrated rrd files
> under `pve-{vm,node,storage}-9.0` and reported them as needing to
> migrate them. the provided command to would of course not migrate them
> so the warning persisted even after the command was run.
>
> limit the find command to the old `pve2-` prefixed folders to prevent
> that.
>
> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
> ---
>   PVE/CLI/pve8to9.pm | 12 +++++++++++-
>   1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
> index 4d61cd831..834432b95 100644
> --- a/PVE/CLI/pve8to9.pm
> +++ b/PVE/CLI/pve8to9.pm
> @@ -1880,7 +1880,17 @@ sub check_rrd_migration {
>           };
>           eval {
>               run_command(
> -                ['find', '/var/lib/rrdcached/db', '-type', 'f', '!', '-name', '*.old'],
> +                [
> +                    'find',
> +                    '/var/lib/rrdcached/db',
> +                    '-path',
> +                    '*pve2-*',
> +                    '-type',
> +                    'f',
> +                    '!',
> +                    '-name',
> +                    '*.old',
> +                ],
>                   outfunc => $count_occurences,
>                   noerr => 1,
>               );


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

[pve-devel] applied: [PATCH manager] pve8to9: don't report already migrated files as needing to be migrated

[Thomas Lamprecht]

On Fri, 01 Aug 2025 11:13:36 +0200, Shannon Sterz wrote:
> the find command previously also found the already migrated rrd files
> under `pve-{vm,node,storage}-9.0` and reported them as needing to
> migrate them. the provided command to would of course not migrate them
> so the warning persisted even after the command was run.
> 
> limit the find command to the old `pve2-` prefixed folders to prevent
> that.
> 
> [...]

Applied, thanks!

[1/1] pve8to9: don't report already migrated files as needing to be migrated
      commit: d73625314f309115986f9e04631542d56a39f0db


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