* [pve-devel] [PATCH manager 1/4] ceph: add get api call for single pool
@ 2020-10-27 16:47 Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 2/4] ceph: gui: ability to edit an existing pool Alwin Antreich
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alwin Antreich @ 2020-10-27 16:47 UTC (permalink / raw)
To: pve-devel
Information of a single pool can be queried.
Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
---
PVE/API2/Ceph.pm | 105 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm
index c3a3091d..e44714f6 100644
--- a/PVE/API2/Ceph.pm
+++ b/PVE/API2/Ceph.pm
@@ -679,11 +679,13 @@ my $ceph_pool_common_options = sub {
my ($nodefault) = shift;
my $options = {
name => {
+ title => 'Name',
description => "The name of the pool. It must be unique.",
type => 'string',
},
size => {
description => 'Number of replicas per object',
+ title => 'Size',
type => 'integer',
default => 3,
optional => 1,
@@ -692,6 +694,7 @@ my $ceph_pool_common_options = sub {
},
min_size => {
description => 'Minimum number of replicas per object',
+ title => 'Min Size',
type => 'integer',
default => 2,
optional => 1,
@@ -700,6 +703,7 @@ my $ceph_pool_common_options = sub {
},
pg_num => {
description => "Number of placement groups.",
+ title => 'PG Num',
type => 'integer',
default => 128,
optional => 1,
@@ -708,11 +712,13 @@ my $ceph_pool_common_options = sub {
},
crush_rule => {
description => "The rule to use for mapping object placement in the cluster.",
+ title => 'Crush Rule Name',
type => 'string',
optional => 1,
},
application => {
description => "The application of the pool.",
+ title => 'Application',
default => 'rbd',
type => 'string',
enum => ['rbd', 'cephfs', 'rgw'],
@@ -720,6 +726,7 @@ my $ceph_pool_common_options = sub {
},
pg_autoscale_mode => {
description => "The automatic PG scaling mode of the pool.",
+ title => 'PG Autoscale Mode',
type => 'string',
enum => ['on', 'off', 'warn'],
default => 'warn',
@@ -734,6 +741,7 @@ my $ceph_pool_common_options = sub {
};
+# FIXME: use pools/{pool_name} with PVE 7.0
__PACKAGE__->register_method ({
name => 'createpool',
path => 'pools',
@@ -997,6 +1005,103 @@ __PACKAGE__->register_method ({
}});
+__PACKAGE__->register_method ({
+ name => 'getpool',
+ path => 'pools/{name}',
+ method => 'GET',
+ description => "List pool settings.",
+ proxyto => 'node',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
+ },
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ node => get_standard_option('pve-node'),
+ name => {
+ description => "The name of the pool. It must be unique.",
+ type => 'string',
+ },
+ verbose => {
+ type => 'boolean',
+ default => 0,
+ optional => 1,
+ description => "If enabled, will display additional data".
+ "(eg. statistics).",
+ },
+ },
+ },
+ returns => {
+ type => "object",
+ properties => {
+ id => { type => 'integer', title => 'ID' },
+ pgp_num => { type => 'integer', title => 'PGP num' },
+ noscrub => { type => 'boolean', title => 'noscrub' },
+ 'nodeep-scrub' => { type => 'boolean', title => 'nodeep-scrub' },
+ nodelete => { type => 'boolean', title => 'nodelete' },
+ nopgchange => { type => 'boolean', title => 'nopgchange' },
+ nosizechange => { type => 'boolean', title => 'nosizechange' },
+ write_fadvise_dontneed => { type => 'boolean', title => 'write_fadvise_dontneed' },
+ hashpspool => { type => 'boolean', title => 'hashpspool' },
+ use_gmt_hitset => { type => 'boolean', title => 'use_gmt_hitset' },
+ fast_read => { type => 'boolean', title => 'Fast Read' },
+ statistics => { type => 'object', title => 'Statistics', optional => 1 },
+ %{ $ceph_pool_common_options->() },
+ },
+ },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Ceph::Tools::check_ceph_inited();
+
+ my $verbose = $param->{verbose};
+ my $pool = $param->{name};
+
+ my $rados = PVE::RADOS->new();
+ my $res = $rados->mon_command({
+ prefix => 'osd pool get',
+ pool => "$pool",
+ var => 'all',
+ });
+
+ my $data = {
+ id => $res->{pool_id},
+ size => $res->{size},
+ min_size => $res->{min_size},
+ pg_num => $res->{pg_num},
+ pgp_num => $res->{pgp_num},
+ crush_rule => $res->{crush_rule},
+ pg_autoscale_mode => $res->{pg_autoscale_mode},
+ noscrub => "$res->{noscrub}",
+ 'nodeep-scrub' => "$res->{'nodeep-scrub'}",
+ nodelete => "$res->{nodelete}",
+ nopgchange => "$res->{nopgchange}",
+ nosizechange => "$res->{nosizechange}",
+ write_fadvise_dontneed => "$res->{write_fadvise_dontneed}",
+ hashpspool => "$res->{hashpspool}",
+ use_gmt_hitset => "$res->{use_gmt_hitset}",
+ fast_read => "$res->{fast_read}",
+ };
+
+ if ($verbose) {
+ my $stats;
+ my $res = $rados->mon_command({ prefix => 'df' });
+
+ foreach my $d (@{$res->{pools}}) {
+ next if !$d->{stats};
+ next if !defined($d->{name}) && !$d->{name} ne "$pool";
+ $data->{statistics} = $d->{stats};
+ }
+
+ my $apps = $rados->mon_command({ prefix => "osd pool application get", pool => "$pool", });
+ $data->{application} = @{ keys %$apps }[0];
+ }
+
+ return $data;
+ }});
+
+
__PACKAGE__->register_method ({
name => 'setpool',
path => 'pools/{name}',
--
2.27.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pve-devel] [PATCH manager 2/4] ceph: gui: ability to edit an existing pool
2020-10-27 16:47 [pve-devel] [PATCH manager 1/4] ceph: add get api call for single pool Alwin Antreich
@ 2020-10-27 16:47 ` Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 3/4] ceph: gui: use separate reload function Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 4/4] ceph: gui: display warning on min_size 1 Alwin Antreich
2 siblings, 0 replies; 4+ messages in thread
From: Alwin Antreich @ 2020-10-27 16:47 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
---
www/manager6/ceph/Pool.js | 82 ++++++++++++++++++++++++++-------------
1 file changed, 56 insertions(+), 26 deletions(-)
diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js
index 11bcf9d5..d1fb2f3e 100644
--- a/www/manager6/ceph/Pool.js
+++ b/www/manager6/ceph/Pool.js
@@ -1,17 +1,33 @@
-Ext.define('PVE.CephCreatePool', {
+Ext.define('PVE.CephPoolEdit', {
extend: 'Proxmox.window.Edit',
- alias: 'widget.pveCephCreatePool',
+ alias: 'widget.pveCephPoolEdit',
+ mixins: ['Proxmox.Mixin.CBind'],
+
+ cbindData: {
+ pool_name: '',
+ isCreate: (cfg) => !cfg.pool_name,
+ },
+
+ cbind: {
+ autoLoad: get => !get('isCreate'),
+ url: get => get('isCreate') ?
+ `/nodes/${get('nodename')}/ceph/pools` :
+ `/nodes/${get('nodename')}/ceph/pools/${get('pool_name')}`,
+ method: get => get('isCreate') ? 'POST' : 'PUT',
+ },
showProgress: true,
onlineHelp: 'pve_ceph_pools',
subject: 'Ceph Pool',
- isCreate: true,
- method: 'POST',
items: [
{
- xtype: 'textfield',
+ xtype: 'pmxDisplayEditField',
fieldLabel: gettext('Name'),
+ cbind: {
+ editable: '{isCreate}',
+ value: '{pool_name}',
+ },
name: 'name',
allowBlank: false
},
@@ -36,6 +52,7 @@ Ext.define('PVE.CephCreatePool', {
{
xtype: 'pveCephRuleSelector',
fieldLabel: 'Crush Rule', // do not localize
+ cbind: { nodename: '{nodename}' },
name: 'crush_rule',
allowBlank: false
},
@@ -65,7 +82,10 @@ Ext.define('PVE.CephCreatePool', {
{
xtype: 'proxmoxcheckbox',
fieldLabel: gettext('Add as Storage'),
- value: true,
+ cbind: {
+ value: '{isCreate}',
+ hidden: '{!isCreate}',
+ },
name: 'add_storages',
autoEl: {
tag: 'div',
@@ -73,22 +93,6 @@ Ext.define('PVE.CephCreatePool', {
},
}
],
- initComponent : function() {
- var me = this;
-
- if (!me.nodename) {
- throw "no node name specified";
- }
-
- Ext.apply(me, {
- url: "/nodes/" + me.nodename + "/ceph/pools",
- defaults: {
- nodename: me.nodename
- }
- });
-
- me.callParent();
- }
});
Ext.define('PVE.node.CephPoolList', {
@@ -203,6 +207,9 @@ Ext.define('PVE.node.CephPoolList', {
});
var store = Ext.create('Proxmox.data.DiffStore', { rstore: rstore });
+ var reload = function() {
+ rstore.load();
+ };
var regex = new RegExp("not (installed|initialized)", "i");
PVE.Utils.handleStoreErrorOrMask(me, rstore, regex, function(me, error){
@@ -219,8 +226,8 @@ Ext.define('PVE.node.CephPoolList', {
var create_btn = new Ext.Button({
text: gettext('Create'),
handler: function() {
- var win = Ext.create('PVE.CephCreatePool', {
- nodename: nodename
+ var win = Ext.create('PVE.CephPoolEdit', {
+ nodename: nodename,
});
win.show();
win.on('destroy', function() {
@@ -229,6 +236,27 @@ Ext.define('PVE.node.CephPoolList', {
}
});
+ var run_editor = function() {
+ var rec = sm.getSelection()[0];
+ if (!rec) {
+ return;
+ }
+
+ var win = Ext.create('PVE.CephPoolEdit', {
+ nodename: nodename,
+ pool_name: rec.data.pool_name,
+ });
+ win.on('destroy', reload);
+ win.show();
+ };
+
+ var edit_btn = new Proxmox.button.Button({
+ text: gettext('Edit'),
+ disabled: true,
+ selModel: sm,
+ handler: run_editor,
+ });
+
var destroy_btn = Ext.create('Proxmox.button.Button', {
text: gettext('Destroy'),
selModel: sm,
@@ -259,10 +287,11 @@ Ext.define('PVE.node.CephPoolList', {
Ext.apply(me, {
store: store,
selModel: sm,
- tbar: [ create_btn, destroy_btn ],
+ tbar: [ create_btn, edit_btn, destroy_btn ],
listeners: {
activate: () => rstore.startUpdate(),
destroy: () => rstore.stopUpdate(),
+ itemdblclick: run_editor,
}
});
@@ -280,7 +309,8 @@ Ext.define('PVE.node.CephPoolList', {
{ name: 'bytes_used', type: 'integer'},
{ name: 'percent_used', type: 'number'},
{ name: 'crush_rule', type: 'integer'},
- { name: 'crush_rule_name', type: 'string'}
+ { name: 'crush_rule_name', type: 'string'},
+ { name: 'pg_autoscale_mode', type: 'string'},
],
idProperty: 'pool_name'
});
--
2.27.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pve-devel] [PATCH manager 3/4] ceph: gui: use separate reload function
2020-10-27 16:47 [pve-devel] [PATCH manager 1/4] ceph: add get api call for single pool Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 2/4] ceph: gui: ability to edit an existing pool Alwin Antreich
@ 2020-10-27 16:47 ` Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 4/4] ceph: gui: display warning on min_size 1 Alwin Antreich
2 siblings, 0 replies; 4+ messages in thread
From: Alwin Antreich @ 2020-10-27 16:47 UTC (permalink / raw)
To: pve-devel
on existing buttons.
Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
---
www/manager6/ceph/Pool.js | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js
index d1fb2f3e..28b0b4a5 100644
--- a/www/manager6/ceph/Pool.js
+++ b/www/manager6/ceph/Pool.js
@@ -230,9 +230,7 @@ Ext.define('PVE.node.CephPoolList', {
nodename: nodename,
});
win.show();
- win.on('destroy', function() {
- rstore.load();
- });
+ win.on('destroy', reload);
}
});
@@ -278,9 +276,7 @@ Ext.define('PVE.node.CephPoolList', {
},
item: { type: 'CephPool', id: rec.data.pool_name }
}).show();
- win.on('destroy', function() {
- rstore.load();
- });
+ win.on('destroy', reload);
}
});
--
2.27.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pve-devel] [PATCH manager 4/4] ceph: gui: display warning on min_size 1
2020-10-27 16:47 [pve-devel] [PATCH manager 1/4] ceph: add get api call for single pool Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 2/4] ceph: gui: ability to edit an existing pool Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 3/4] ceph: gui: use separate reload function Alwin Antreich
@ 2020-10-27 16:47 ` Alwin Antreich
2 siblings, 0 replies; 4+ messages in thread
From: Alwin Antreich @ 2020-10-27 16:47 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
---
www/manager6/ceph/Pool.js | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js
index 28b0b4a5..93ed667e 100644
--- a/www/manager6/ceph/Pool.js
+++ b/www/manager6/ceph/Pool.js
@@ -47,7 +47,23 @@ Ext.define('PVE.CephPoolEdit', {
value: 2,
minValue: 1,
maxValue: 7,
- allowBlank: false
+ allowBlank: false,
+ listeners: {
+ change: function(field, val) {
+ if (val < 2) {
+ field.up().down('field[name=min_size-warning]').setHidden(false);
+ field.setFieldLabel(gettext('Min. Size') + ' <i class="fa fa-exclamation-triangle warning"></i>');
+ }
+ }
+ },
+ },
+ {
+ xtype: 'displayfield',
+ name: 'min_size-warning',
+ padding: '5 0 0 0',
+ userCls: 'pmx-hint',
+ value: 'A pool with min_size=1 could lead to data loss, incomplete PGs or unfound objects.',
+ hidden: true,
},
{
xtype: 'pveCephRuleSelector',
--
2.27.0
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-27 16:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-27 16:47 [pve-devel] [PATCH manager 1/4] ceph: add get api call for single pool Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 2/4] ceph: gui: ability to edit an existing pool Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 3/4] ceph: gui: use separate reload function Alwin Antreich
2020-10-27 16:47 ` [pve-devel] [PATCH manager 4/4] ceph: gui: display warning on min_size 1 Alwin Antreich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox