Am 20/10/2022 um 09:17 schrieb Stefan Sterz:
> previously the ui would allow adding all pools (even the default
> ceph-mon pools) as storage. this could lead to issues when users did
> use these pools as storage (e.g.: vms missing their disks after a
> migration). hence, restrict the pool selector to rbd pools.
> 
> fails gracefully by reverting to the previous behavior if a pool has
> no application assigned to it.
> 
> Signed-off-by: Stefan Sterz <s.st...@proxmox.com>
> ---
> v3: changed the name of the filter function based on alwin antreich's
> suggestion
> 
>  www/manager6/form/CephPoolSelector.js | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/www/manager6/form/CephPoolSelector.js 
> b/www/manager6/form/CephPoolSelector.js
> index 5b96398d..b98feb54 100644
> --- a/www/manager6/form/CephPoolSelector.js
> +++ b/www/manager6/form/CephPoolSelector.js
> @@ -15,9 +15,17 @@ Ext.define('PVE.form.CephPoolSelector', {
>           throw "no nodename given";
>       }
>  
> +     let onlyCephRBDPools = (item) => {
> +         let apps = item.data?.applications;
> +         return apps === undefined || apps?.rbd !== undefined;

couldn't this be a one liner? and as nit I'd maybe drop the Ceph from the name,
suggests a bit that we got non-ceph rbd pools.

// filter out rgw, metadata, cephfs, ... pools
onlyRBDPools = ({data}) => !!data?.applications?.rbd;


more generally, the application could be also shown in our ceph pool list, could
be useful to see the usage type of each pool, would also reduce confusion for 
the
a bit odd metadata pool with its single PG.

> +     };
> +
>       var store = Ext.create('Ext.data.Store', {
>           fields: ['name'],
>           sorters: 'name',
> +         filters: [
> +             onlyCephRBDPools,
> +         ],
>           proxy: {
>               type: 'proxmox',
>               url: '/api2/json/nodes/' + me.nodename + '/ceph/pools',
> @@ -32,8 +40,10 @@ Ext.define('PVE.form.CephPoolSelector', {
>  
>       store.load({
>           callback: function(rec, op, success) {
> -             if (success && rec.length > 0) {
> -                 me.select(rec[0]);
> +             let filteredRec = rec.filter(onlyCephRBDPools);
> +
> +             if (success && filteredRec.length > 0) {
> +                 me.select(filteredRec[0]);
>               }
>           },
>       });



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

Reply via email to