Commit eadc6957 authored by Dietmar Maurer's avatar Dietmar Maurer

ceph: view osd commit/apply latency

parent 92e4d5fc
...@@ -108,6 +108,10 @@ __PACKAGE__->register_method ({ ...@@ -108,6 +108,10 @@ __PACKAGE__->register_method ({
$new->{total_space} = ($stat->{kb} || 1) * 1024; $new->{total_space} = ($stat->{kb} || 1) * 1024;
$new->{bytes_used} = ($stat->{kb_used} || 0) * 1024; $new->{bytes_used} = ($stat->{kb_used} || 0) * 1024;
$new->{percent_used} = ($new->{bytes_used}*100)/$new->{total_space}; $new->{percent_used} = ($new->{bytes_used}*100)/$new->{total_space};
if (my $d = $stat->{fs_perf_stat}) {
$new->{commit_latency_ms} = $d->{commit_latency_ms};
$new->{apply_latency_ms} = $d->{apply_latency_ms};
}
} }
$newnodes->{$e->{id}} = $new; $newnodes->{$e->{id}} = $new;
......
...@@ -448,6 +448,8 @@ Ext.define('PVE.node.CephOsdTree', { ...@@ -448,6 +448,8 @@ Ext.define('PVE.node.CephOsdTree', {
{ type: 'number', name: 'percent_used' }, { type: 'number', name: 'percent_used' },
{ type: 'integer', name: 'bytes_used' }, { type: 'integer', name: 'bytes_used' },
{ type: 'integer', name: 'total_space' }, { type: 'integer', name: 'total_space' },
{ type: 'integer', name: 'apply_latency_ms' },
{ type: 'integer', name: 'commit_latency_ms' },
{ type: 'number', name: 'crush_weight' }], { type: 'number', name: 'crush_weight' }],
stateful: false, stateful: false,
selModel: sm, selModel: sm,
...@@ -502,7 +504,22 @@ Ext.define('PVE.node.CephOsdTree', { ...@@ -502,7 +504,22 @@ Ext.define('PVE.node.CephOsdTree', {
width: 60 width: 60
}, },
{ {
text: gettext('Size'), header: gettext('Used'),
columns: [
{
text: '%',
dataIndex: 'percent_used',
align: 'right',
renderer: function(value, metaData, rec) {
if (rec.data.type !== 'osd') {
return '';
}
return Ext.util.Format.number(value, '0.00');
},
width: 80
},
{
text: gettext('Total'),
dataIndex: 'total_space', dataIndex: 'total_space',
align: 'right', align: 'right',
renderer: function(value, metaData, rec) { renderer: function(value, metaData, rec) {
...@@ -512,18 +529,37 @@ Ext.define('PVE.node.CephOsdTree', { ...@@ -512,18 +529,37 @@ Ext.define('PVE.node.CephOsdTree', {
return PVE.Utils.render_size(value); return PVE.Utils.render_size(value);
}, },
width: 100 width: 100
}
]
}, },
{ {
text: gettext('Used') + ' %', header: gettext('Latency (ms)'),
dataIndex: 'percent_used', columns: [
{
text: 'Apply',
dataIndex: 'apply_latency_ms',
align: 'right', align: 'right',
renderer: function(value, metaData, rec) { renderer: function(value, metaData, rec) {
if (rec.data.type !== 'osd') { if (rec.data.type !== 'osd') {
return ''; return '';
} }
return Ext.util.Format.number(value, '0.00'); return value;
}, },
width: 80 width: 60
},
{
text: 'Commit',
dataIndex: 'commit_latency_ms',
align: 'right',
renderer: function(value, metaData, rec) {
if (rec.data.type !== 'osd') {
return '';
}
return value;
},
width: 60
}
]
} }
], ],
listeners: { listeners: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment