Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(xo-server): handle unfetched VDIs in pool.$ha_statefiles #6404

Merged
merged 6 commits into from
Sep 6, 2022
Merged

fix(xo-server): handle unfetched VDIs in pool.$ha_statefiles #6404

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72154a8
fix(xo-server): fix Cannot read properties of undefined (reading 'haS…
MathieuRA Sep 5, 2022
326a4a5
changelog
MathieuRA Sep 5, 2022
ff1c11f
remove change on link()
MathieuRA Sep 5, 2022
9fc179f
changelog
MathieuRA Sep 6, 2022
011d596
Update packages/xo-server/src/xapi-object-to-xo.mjs
MathieuRA Sep 6, 2022
d6471eb
Merge branch 'master' into fixIsHa
MathieuRA Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@

<!--packages-start-->

- xo-server patch

<!--packages-end-->
5 changes: 4 additions & 1 deletion packages/xo-server/src/xapi-object-to-xo.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ const ALLOCATION_BY_TYPE = {
const { defineProperties, freeze } = Object

function link(obj, prop, idField = '$id') {
if (obj === undefined) {
return undefined
}
const dynamicValue = obj[`$${prop}`]
if (dynamicValue == null) {
return dynamicValue // Properly handles null and undefined.
Expand Down Expand Up @@ -107,7 +110,7 @@ const TRANSFORMS = {
current_operations: obj.current_operations,
default_SR: link(obj, 'default_SR'),
HA_enabled: Boolean(obj.ha_enabled),
haSrs: obj.$ha_statefiles.map(vdi => link(vdi, 'SR')),
haSrs: obj.$ha_statefiles.map(vdi => link(vdi, 'SR')).filter(sr => sr !== undefined),
julien-f marked this conversation as resolved.
Show resolved Hide resolved
master: link(obj, 'master'),
tags: obj.tags,
name_description: obj.name_description,
Expand Down