[pve-devel] [PATCH storage 1/2] rbd: remove no longer used rados_cmd helper

[pve-devel] [PATCH storage 1/2] rbd: remove no longer used rados_cmd helper

[Fabian Grünbichler]

all librados interaction is now via our XS binding, the last usage was
removed in 41aacc6cdeea9b0c8007cbfb280acf827932c3d6

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/PVE/Storage/RBDPlugin.pm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
index c78db00..162c016 100644
--- a/src/PVE/Storage/RBDPlugin.pm
+++ b/src/PVE/Storage/RBDPlugin.pm
@@ -124,12 +124,6 @@ my $rbd_cmd = sub {
     return $build_cmd->('/usr/bin/rbd', $scfg, $storeid, $op, @options);
 };
 
-my $rados_cmd = sub {
-    my ($scfg, $storeid, $op, @options) = @_;
-
-    return $build_cmd->('/usr/bin/rados', $scfg, $storeid, $op, @options);
-};
-
 # needed for volumes created using ceph jewel (or higher)
 my $krbd_feature_update = sub {
     my ($scfg, $storeid, $name) = @_;
-- 
2.39.5



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

[pve-devel] [PATCH storage 2/2] rbd: merge rbd_cmd and build_cmd helpers

[Fabian Grünbichler]

since the former was just a wrapper around the latter, and the only call
site..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/PVE/Storage/RBDPlugin.pm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
index 162c016..73bc97e 100644
--- a/src/PVE/Storage/RBDPlugin.pm
+++ b/src/PVE/Storage/RBDPlugin.pm
@@ -84,14 +84,13 @@ my sub get_rbd_dev_path {
     return $pve_path;
 }
 
-my $build_cmd = sub {
-    my ($binary, $scfg, $storeid, $op, @options) = @_;
+my $rbd_cmd = sub {
+    my ($scfg, $storeid, $op, @options) = @_;
 
     my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
 
-
-    my $cmd = [$binary];
+    my $cmd = ['/usr/bin/rbd'];
     if ($op eq 'import') {
 	push $cmd->@*, '--dest-pool', $pool;
     } else {
@@ -118,12 +117,6 @@ my $build_cmd = sub {
     return $cmd;
 };
 
-my $rbd_cmd = sub {
-    my ($scfg, $storeid, $op, @options) = @_;
-
-    return $build_cmd->('/usr/bin/rbd', $scfg, $storeid, $op, @options);
-};
-
 # needed for volumes created using ceph jewel (or higher)
 my $krbd_feature_update = sub {
     my ($scfg, $storeid, $name) = @_;
-- 
2.39.5



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

Re: [pve-devel] [PATCH storage 1/2] rbd: remove no longer used rados_cmd helper

[Aaron Lauterer]

tested both patches:
* list contents
* snapshot & rollback & delete snapshot of a VM
* add new disk, detach & delete
* move-disk

Consider these two patches

Reviewed-By: Aaron Lauterer <a.lauterer@proxmox.com>
Tested-By: Aaron Lauterer <a.lauterer@proxmox.com>

On  2025-04-22  10:56, Fabian Grünbichler wrote:
> all librados interaction is now via our XS binding, the last usage was
> removed in 41aacc6cdeea9b0c8007cbfb280acf827932c3d6
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>   src/PVE/Storage/RBDPlugin.pm | 6 ------
>   1 file changed, 6 deletions(-)
> 
> diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
> index c78db00..162c016 100644
> --- a/src/PVE/Storage/RBDPlugin.pm
> +++ b/src/PVE/Storage/RBDPlugin.pm
> @@ -124,12 +124,6 @@ my $rbd_cmd = sub {
>       return $build_cmd->('/usr/bin/rbd', $scfg, $storeid, $op, @options);
>   };
>   
> -my $rados_cmd = sub {
> -    my ($scfg, $storeid, $op, @options) = @_;
> -
> -    return $build_cmd->('/usr/bin/rados', $scfg, $storeid, $op, @options);
> -};
> -
>   # needed for volumes created using ceph jewel (or higher)
>   my $krbd_feature_update = sub {
>       my ($scfg, $storeid, $name) = @_;



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

[pve-devel] applied-series: [PATCH storage 1/2] rbd: remove no longer used rados_cmd helper

[Fabian Grünbichler]

with Aaron's T-b/R-b, thanks!

[1/2] rbd: remove no longer used rados_cmd helper
      commit: e2b9e36f488af16a827f97fa699db12c91022ca5
[2/2] rbd: merge rbd_cmd and build_cmd helpers
      commit: b265925d641512b1e71e46296f8601e963555b23

Best regards,
-- 
Fabian Grünbichler <f.gruenbichler@proxmox.com>


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