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

fix(xo-server): do not count snapshots in self quotas (#2682)

Browse Source 
Fixes #2626
This commit is contained in:
Pierre Donias
2018-02-23 15:00:23 +01:00
committed by Julien Fontanet
parent 11d4cb2f04
commit 75521f8757
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/xo-server/src/api/vm.js
View File

@@ -356,8 +356,10 @@ async function delete_ ({
) )
// Update resource sets // Update resource sets
const resourceSet = xapi.xo.getData(vm._xapiId, 'resourceSet') if (
if (resourceSet != null) { vm.type === 'VM' && // only regular VMs
xapi.xo.getData(vm._xapiId, 'resourceSet') != null
) {
;this.setVmResourceSet(vm._xapiId, null)::ignoreErrors() ;this.setVmResourceSet(vm._xapiId, null)::ignoreErrors()
} }

1
packages/xo-server/src/xo-mixins/resource-sets.js
View File

@@ -335,6 +335,7 @@ export default class {
let set let set
if ( if (
object.$type !== 'vm' || object.$type !== 'vm' ||
object.is_a_snapshot ||
// No set for this VM. // No set for this VM.
!(id = xapi.xo.getData(object, 'resourceSet')) || !(id = xapi.xo.getData(object, 'resourceSet')) ||
// Not our set. // Not our set.