Am 09.09.21 um 18:24 schrieb Thomas Lamprecht:
On 07.09.21 11:30, Fabian Ebner wrote:
Previously, top-level vdevs like log or special were wrongly added as
children of the previous outer vdev instead of the root.
Fix it by also showing the vdev with the same name as the pool and
start counting from level 1 (the pool itself serves as the root and
should be the only one with level 0). This results in the same kind
of structure as in PBS and (except for the root) zpool status itself.
Signed-off-by: Fabian Ebner <[email protected]>
---
PVE/API2/Disks/ZFS.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/Disks/ZFS.pm b/PVE/API2/Disks/ZFS.pm
index 0418794..60077c4 100644
--- a/PVE/API2/Disks/ZFS.pm
+++ b/PVE/API2/Disks/ZFS.pm
@@ -240,8 +240,8 @@ __PACKAGE__->register_method ({
$config = 1;
} elsif ($config && $line =~
m/^(\s+)(\S+)\s*(\S+)?(?:\s+(\S+)\s+(\S+)\s+(\S+))?\s*(.*)$/) {
my ($space, $name, $state, $read, $write, $cksum, $msg) = ($1,
$2, $3, $4, $5, $6, $7);
- if ($name ne "NAME" and $name ne $param->{name}) {
- my $lvl= int(length($space)/2); # two spaces per level
+ if ($name ne "NAME") {
+ my $lvl = int(length($space) / 2) + 1; # two spaces per
level
my $vdev = {
name => $name,
msg => $msg,
hmm, I get the idea and can see how one could assert that this is more correct,
but as it is presented it'd be a bit more confusing too, IMO, as it does not
matches the zpool status CLI output anymore.
I.e., the following (real):
NAME STATE READ WRITE CKSUM
zpt ONLINE 0 0 0
mirror-0 ONLINE 0 0 0
scsi-0QEMU_QEMU_HARDDISK_drive-scsi3 ONLINE 0 0 0
scsi-0QEMU_QEMU_HARDDISK_drive-scsi4 ONLINE 0 0 0
logs
scsi-0QEMU_QEMU_HARDDISK_drive-scsi5 ONLINE 0 0 0
Is suggested to be (adapted):
NAME STATE READ WRITE CKSUM
zpt ONLINE
zpt ONLINE 0 0 0
mirror-0 ONLINE 0 0 0
scsi-0QEMU_QEMU_HARDDISK_drive-scsi3 ONLINE 0 0 0
scsi-0QEMU_QEMU_HARDDISK_drive-scsi4 ONLINE 0 0 0
logs
scsi-0QEMU_QEMU_HARDDISK_drive-scsi5 ONLINE 0 0 0
Is 'logs' aligned with the outer 'zpt' or the inner 'zpt'? It's intended
to be the inner one, but in the mail it looks like the outer one to me.
How about hiding the root in the devices tree and add a line to the
KV grid above instead? E.g., something that would then render:
Pool <ID> (<STATUS>)
That can be a GUI change only, did not really checked implementation details,
but
I'd like to clear that up before applying this patch.
I suppose that should be done for PBS too then? And PVE should switch to
using the ZFSDetail window from widget-toolkit?
_______________________________________________
pve-devel mailing list
[email protected]
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
