NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xo-web/dashboard): empty VDIs shouldn't be flagged as orphan (#7102)

Browse Source 
Fixes zammad#15524
This commit is contained in:
Florent BEAUCHAMP
2023-11-06 13:57:44 +01:00
committed by GitHub
parent c9dbcf1384
commit f6819b23f9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.unreleased.md
View File

@@ -14,6 +14,7 @@
- [Netbox] Fix VMs' `site` property being unnecessarily updated on some versions of Netbox (PR [#7145](https://github.com/vatesfr/xen-orchestra/pull/7145)) - [Netbox] Fix VMs' `site` property being unnecessarily updated on some versions of Netbox (PR [#7145](https://github.com/vatesfr/xen-orchestra/pull/7145))
- [Netbox] Fix "400 Bad Request" error (PR [#7153](https://github.com/vatesfr/xen-orchestra/pull/7153)) - [Netbox] Fix "400 Bad Request" error (PR [#7153](https://github.com/vatesfr/xen-orchestra/pull/7153))
- [Backup/Restore] Fix timeout after 5 minutes [#7052](https://github.com/vatesfr/xen-orchestra/issues/7052) - [Backup/Restore] Fix timeout after 5 minutes [#7052](https://github.com/vatesfr/xen-orchestra/issues/7052)
- [Dashboard/Health] Empty VDIs are no longer considered orphans (PR [#7102](https://github.com/vatesfr/xen-orchestra/pull/7102))
### Packages to release ### Packages to release
@@ -33,5 +34,5 @@
- @xen-orchestra/proxy patch - @xen-orchestra/proxy patch
- xo-server-netbox patch - xo-server-netbox patch
- xo-web patch
<!--packages-end--> <!--packages-end-->

6
packages/xo-web/src/xo-app/dashboard/health/index.js
View File

@@ -525,7 +525,11 @@ const HANDLED_VDI_TYPES = new Set(['system', 'user', 'ephemeral'])
Object.assign({}, vdis, snapshotVdis) Object.assign({}, vdis, snapshotVdis)
), ),
createSelector(getSrs, srs => vdi => { createSelector(getSrs, srs => vdi => {
if (vdi.$VBDs.length !== 0 || !HANDLED_VDI_TYPES.has(vdi.VDI_type)) { if (
vdi.$VBDs.length !== 0 || // vdi with a vbd aren't orphans
!HANDLED_VDI_TYPES.has(vdi.VDI_type) || // only for vdi with handled types
vdi.size === 0 // empty vdi aren't considered as orphans
) {
return false return false
} }