The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7129
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
To speed up lxc list command.
Fixes #7124
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
From 152ea611ca07670d37904fbf4759394ecd121d3f Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Fri, 3 Apr 2020 09:02:49 +0100
Subject: [PATCH] lxd/instance/drivers: Removes
storagePools.RenderSnapshotUsage from RenderFull()
To speed up lxc list command.
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/instance/drivers/driver_lxc.go | 2 +-
lxd/instance/drivers/driver_qemu.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxd/instance/drivers/driver_lxc.go
b/lxd/instance/drivers/driver_lxc.go
index ca993c909f..dd51e600d7 100644
--- a/lxd/instance/drivers/driver_lxc.go
+++ b/lxd/instance/drivers/driver_lxc.go
@@ -3119,7 +3119,7 @@ func (c *lxc) RenderFull() (*api.InstanceFull,
interface{}, error) {
}
for _, snap := range snaps {
- render, _, err :=
snap.Render(storagePools.RenderSnapshotUsage(c.state, c))
+ render, _, err := snap.Render()
if err != nil {
return nil, nil, err
}
diff --git a/lxd/instance/drivers/driver_qemu.go
b/lxd/instance/drivers/driver_qemu.go
index 3e9ce1eb51..9c19e22b9f 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -3582,7 +3582,7 @@ func (vm *qemu) RenderFull() (*api.InstanceFull,
interface{}, error) {
}
for _, snap := range snaps {
- render, _, err :=
snap.Render(storagePools.RenderSnapshotUsage(vm.state, vm))
+ render, _, err := snap.Render()
if err != nil {
return nil, nil, err
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
