fix(xo-web/VM): SR no longer required if a migration network is selected

.eslintrc.js

@@ -65,11 +65,10 @@ module.exports = {
           typescript: true,
           'eslint-import-resolver-custom-alias': {
             alias: {
-              '@core': '../web-core/lib',
               '@': './src',
             },
             extensions: ['.ts'],
-            packages: ['@xen-orchestra/lite', '@xen-orchestra/web'],
+            packages: ['@xen-orchestra/lite'],
           },
         },
       },

@xen-orchestra/backups/ImportVmBackup.mjs

@@ -160,10 +160,10 @@ export class ImportVmBackup {
           // update the stream with the negative vhd stream
           stream = await negativeVhd.stream()
           vdis[vdiRef].baseVdi = snapshotCandidate
-        } catch (error) {
+        } catch (err) {
           // can be a broken VHD chain, a vhd chain with a key backup, ....
           // not an irrecuperable error, don't dispose parentVhd, and fallback to full restore
-          warn(`can't use differential restore`, { error })
+          warn(`can't use differential restore`, err)
           disposableDescendants?.dispose()
         }
       }

@xen-orchestra/backups/_runners/VmsRemote.mjs

@@ -6,12 +6,11 @@ import { extractIdsFromSimplePattern } from '../extractIdsFromSimplePattern.mjs'
 import { Task } from '../Task.mjs'
 import createStreamThrottle from './_createStreamThrottle.mjs'
 import { DEFAULT_SETTINGS, Abstract } from './_Abstract.mjs'
+import { runTask } from './_runTask.mjs'
 import { getAdaptersByRemote } from './_getAdaptersByRemote.mjs'
 import { FullRemote } from './_vmRunners/FullRemote.mjs'
 import { IncrementalRemote } from './_vmRunners/IncrementalRemote.mjs'
 
-const noop = Function.prototype
-
 const DEFAULT_REMOTE_VM_SETTINGS = {
   concurrency: 2,
   copyRetention: 0,
@@ -21,7 +20,6 @@ const DEFAULT_REMOTE_VM_SETTINGS = {
   healthCheckVmsWithTags: [],
   maxExportRate: 0,
   maxMergedDeltasPerRun: Infinity,
-  nRetriesVmBackupFailures: 0,
   timeout: 0,
   validateVhdStreams: false,
   vmTimeout: 0,
@@ -43,7 +41,6 @@ export const VmsRemote = class RemoteVmsBackupRunner extends Abstract {
     const throttleStream = createStreamThrottle(settings.maxExportRate)
 
     const config = this._config
-
     await Disposable.use(
       () => this._getAdapter(job.sourceRemote),
       () => (settings.healthCheckSr !== undefined ? this._getRecord('SR', settings.healthCheckSr) : undefined),
@@ -65,19 +62,8 @@ export const VmsRemote = class RemoteVmsBackupRunner extends Abstract {
         const allSettings = this._job.settings
         const baseSettings = this._baseSettings
 
-        const queue = new Set(vmsUuids)
-        const taskByVmId = {}
-        const nTriesByVmId = {}
-
         const handleVm = vmUuid => {
-          if (nTriesByVmId[vmUuid] === undefined) {
-            nTriesByVmId[vmUuid] = 0
-          }
-          nTriesByVmId[vmUuid]++
-
           const taskStart = { name: 'backup VM', data: { type: 'VM', id: vmUuid } }
-          const vmSettings = { ...settings, ...allSettings[vmUuid] }
-          const isLastRun = nTriesByVmId[vmUuid] === vmSettings.nRetriesVmBackupFailures + 1
 
           const opts = {
             baseSettings,
@@ -86,7 +72,7 @@ export const VmsRemote = class RemoteVmsBackupRunner extends Abstract {
             healthCheckSr,
             remoteAdapters,
             schedule,
-            settings: vmSettings,
+            settings: { ...settings, ...allSettings[vmUuid] },
             sourceRemoteAdapter,
             throttleStream,
             vmUuid,
@@ -100,39 +86,10 @@ export const VmsRemote = class RemoteVmsBackupRunner extends Abstract {
             throw new Error(`Job mode ${job.mode} not implemented for mirror backup`)
           }
 
-          if (taskByVmId[vmUuid] === undefined) {
-            taskByVmId[vmUuid] = new Task(taskStart)
-          }
-          const task = taskByVmId[vmUuid]
-          return task
-            .run(async () => {
-              try {
-                const result = await vmBackup.run()
-                task.success(result)
-                return result
-              } catch (error) {
-                if (isLastRun) {
-                  throw error
-                } else {
-                  Task.warning(`Retry the VM mirror backup due to an error`, {
-                    attempt: nTriesByVmId[vmUuid],
-                    error: error.message,
-                  })
-                  queue.add(vmUuid)
-                }
-              }
-            })
-            .catch(noop)
+          return runTask(taskStart, () => vmBackup.run())
         }
         const { concurrency } = settings
-        const _handleVm = !concurrency ? handleVm : limitConcurrency(concurrency)(handleVm)
-
-        while (queue.size > 0) {
-          const vmIds = Array.from(queue)
-          queue.clear()
-
-          await asyncMapSettled(vmIds, _handleVm)
-        }
+        await asyncMapSettled(vmsUuids, !concurrency ? handleVm : limitConcurrency(concurrency)(handleVm))
       }
     )
   }

@xen-orchestra/backups/_runners/VmsXapi.mjs

@@ -11,8 +11,6 @@ import { getAdaptersByRemote } from './_getAdaptersByRemote.mjs'
 import { IncrementalXapi } from './_vmRunners/IncrementalXapi.mjs'
 import { FullXapi } from './_vmRunners/FullXapi.mjs'
 
-const noop = Function.prototype
-
 const DEFAULT_XAPI_VM_SETTINGS = {
   bypassVdiChainsCheck: false,
   checkpointSnapshot: false,
@@ -26,7 +24,6 @@ const DEFAULT_XAPI_VM_SETTINGS = {
   healthCheckVmsWithTags: [],
   maxExportRate: 0,
   maxMergedDeltasPerRun: Infinity,
-  nRetriesVmBackupFailures: 0,
   offlineBackup: false,
   offlineSnapshot: false,
   snapshotRetention: 0,
@@ -56,7 +53,6 @@ export const VmsXapi = class VmsXapiBackupRunner extends Abstract {
     const throttleStream = createStreamThrottle(settings.maxExportRate)
 
     const config = this._config
-
     await Disposable.use(
       Disposable.all(
         extractIdsFromSimplePattern(job.srs).map(id =>
@@ -93,98 +89,48 @@ export const VmsXapi = class VmsXapiBackupRunner extends Abstract {
         const allSettings = this._job.settings
         const baseSettings = this._baseSettings
 
-        const queue = new Set(vmIds)
-        const taskByVmId = {}
-        const nTriesByVmId = {}
-
         const handleVm = vmUuid => {
-          const getVmTask = () => {
-            if (taskByVmId[vmUuid] === undefined) {
-              taskByVmId[vmUuid] = new Task(taskStart)
-            }
-            return taskByVmId[vmUuid]
-          }
-          const vmBackupFailed = error => {
-            if (isLastRun) {
-              throw error
-            } else {
-              Task.warning(`Retry the VM backup due to an error`, {
-                attempt: nTriesByVmId[vmUuid],
-                error: error.message,
-              })
-              queue.add(vmUuid)
-            }
-          }
-
-          if (nTriesByVmId[vmUuid] === undefined) {
-            nTriesByVmId[vmUuid] = 0
-          }
-          nTriesByVmId[vmUuid]++
-
-          const vmSettings = { ...settings, ...allSettings[vmUuid] }
           const taskStart = { name: 'backup VM', data: { type: 'VM', id: vmUuid } }
-          const isLastRun = nTriesByVmId[vmUuid] === vmSettings.nRetriesVmBackupFailures + 1
 
           return this._getRecord('VM', vmUuid).then(
             disposableVm =>
-              Disposable.use(disposableVm, async vm => {
-                if (taskStart.data.name_label === undefined) {
-                  taskStart.data.name_label = vm.name_label
-                }
-
-                const task = getVmTask()
-                return task
-                  .run(async () => {
-                    const opts = {
-                      baseSettings,
-                      config,
-                      getSnapshotNameLabel,
-                      healthCheckSr,
-                      job,
-                      remoteAdapters,
-                      schedule,
-                      settings: vmSettings,
-                      srs,
-                      throttleStream,
-                      vm,
-                    }
-
-                    let vmBackup
-                    if (job.mode === 'delta') {
-                      vmBackup = new IncrementalXapi(opts)
+              Disposable.use(disposableVm, vm => {
+                taskStart.data.name_label = vm.name_label
+                return runTask(taskStart, () => {
+                  const opts = {
+                    baseSettings,
+                    config,
+                    getSnapshotNameLabel,
+                    healthCheckSr,
+                    job,
+                    remoteAdapters,
+                    schedule,
+                    settings: { ...settings, ...allSettings[vm.uuid] },
+                    srs,
+                    throttleStream,
+                    vm,
+                  }
+                  let vmBackup
+                  if (job.mode === 'delta') {
+                    vmBackup = new IncrementalXapi(opts)
+                  } else {
+                    if (job.mode === 'full') {
+                      vmBackup = new FullXapi(opts)
                     } else {
-                      if (job.mode === 'full') {
-                        vmBackup = new FullXapi(opts)
-                      } else {
-                        throw new Error(`Job mode ${job.mode} not implemented`)
-                      }
+                      throw new Error(`Job mode ${job.mode} not implemented`)
                     }
-
-                    try {
-                      const result = await vmBackup.run()
-                      task.success(result)
-                      return result
-                    } catch (error) {
-                      vmBackupFailed(error)
-                    }
-                  })
-                  .catch(noop) // errors are handled by logs
+                  }
+                  return vmBackup.run()
+                })
               }),
             error =>
-              getVmTask().run(() => {
-                vmBackupFailed(error)
+              runTask(taskStart, () => {
+                throw error
               })
           )
         }
         const { concurrency } = settings
-        const _handleVm = concurrency === 0 ? handleVm : limitConcurrency(concurrency)(handleVm)
-
-        while (queue.size > 0) {
-          const vmIds = Array.from(queue)
-          queue.clear()
-
-          await asyncMapSettled(vmIds, _handleVm)
-        }
+        await asyncMapSettled(vmIds, concurrency === 0 ? handleVm : limitConcurrency(concurrency)(handleVm))
       }
     )
   }

@xen-orchestra/backups/_runners/_writers/IncrementalRemoteWriter.mjs

@@ -143,10 +143,8 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
 
     let metadataContent = await this._isAlreadyTransferred(timestamp)
     if (metadataContent !== undefined) {
-      // skip backup while being vigilant to not stuck the forked stream
+      // @todo : should skip backup while being vigilant to not stuck the forked stream
       Task.info('This backup has already been transfered')
-      Object.values(deltaExport.streams).forEach(stream => stream.destroy())
-      return { size: 0 }
     }
 
     const basename = formatFilenameDate(timestamp)

@xen-orchestra/backups/_runners/_writers/_MixinRemoteWriter.mjs

@@ -113,13 +113,13 @@ export const MixinRemoteWriter = (BaseClass = Object) =>
       )
     }
 
-    async _isAlreadyTransferred(timestamp) {
+    _isAlreadyTransferred(timestamp) {
       const vmUuid = this._vmUuid
       const adapter = this._adapter
       const backupDir = getVmBackupDir(vmUuid)
       try {
         const actualMetadata = JSON.parse(
-          await adapter._handler.readFile(`${backupDir}/${formatFilenameDate(timestamp)}.json`)
+          adapter._handler.readFile(`${backupDir}/${formatFilenameDate(timestamp)}.json`)
         )
         return actualMetadata
       } catch (error) {}

@xen-orchestra/fs/src/path.js

@@ -20,7 +20,5 @@ export function split(path) {
   return parts
 }
 
-// paths are made absolute otherwise fs.relative() would resolve them against working directory
-export const relativeFromFile = (file, path) => relative(dirname(normalize(file)), normalize(path))
-
+export const relativeFromFile = (file, path) => relative(dirname(file), path)
 export const resolveFromFile = (file, path) => resolve('/', dirname(file), path).slice(1)

@xen-orchestra/fs/src/path.test.js

@@ -1,17 +0,0 @@
-import { describe, it } from 'test'
-import { strict as assert } from 'assert'
-
-import { relativeFromFile } from './path.js'
-
-describe('relativeFromFile()', function () {
-  for (const [title, args] of Object.entries({
-    'file absolute and path absolute': ['/foo/bar/file.vhd', '/foo/baz/path.vhd'],
-    'file relative and path absolute': ['foo/bar/file.vhd', '/foo/baz/path.vhd'],
-    'file absolute and path relative': ['/foo/bar/file.vhd', 'foo/baz/path.vhd'],
-    'file relative and path relative': ['foo/bar/file.vhd', 'foo/baz/path.vhd'],
-  })) {
-    it('works with ' + title, function () {
-      assert.equal(relativeFromFile(...args), '../baz/path.vhd')
-    })
-  }
-})

@xen-orchestra/immutable-backups/package.json

@@ -17,7 +17,7 @@
     "xo-lift-remote-immutability": "./liftProtection.mjs"
   },
   "license": "AGPL-3.0-or-later",
-  "version": "1.0.1",
+  "version": "1.0.0",
   "engines": {
     "node": ">=14.0.0"
   },

@xen-orchestra/immutable-backups/protectRemotes.mjs

@@ -54,10 +54,10 @@ async function handleExistingFile(root, indexPath, path) {
         await indexFile(fullPath, indexPath)
       }
     }
-  } catch (error) {
-    if (error.code !== 'EEXIST') {
+  } catch (err) {
+    if (err.code !== 'EEXIST') {
       // there can be a symbolic link in the tree
-      warn('handleExistingFile', { error })
+      warn('handleExistingFile', err)
     }
   }
 }
@@ -106,7 +106,7 @@ export async function watchRemote(remoteId, { root, immutabilityDuration, rebuil
     await File.liftImmutability(settingPath)
   } catch (error) {
     // file may not exists, and it's not really a problem
-    info('lifting immutability on current settings', { error })
+    info('lifting immutability on current settings', error)
   }
   await fs.writeFile(
     settingPath,

@xen-orchestra/lite/src/libs/xapi-stats.ts

@@ -50,17 +50,7 @@ const RRD_POINTS_PER_STEP: { [key in RRD_STEP]: number } = {
 // Utils
 // -------------------------------------------------------------------
 
-function parseNumber(value: number | string) {
-  // Starting from XAPI 23.31, numbers in the JSON payload are encoded as
-  // strings to support NaN, Infinity and -Infinity
-  if (typeof value === 'string') {
-    const asNumber = +value
-    if (isNaN(asNumber) && value !== 'NaN') {
-      throw new Error('cannot parse number: ' + value)
-    }
-    value = asNumber
-  }
-
+function convertNanToNull(value: number) {
   return isNaN(value) ? null : value
 }
 
@@ -69,7 +59,7 @@ function parseNumber(value: number | string) {
 // -------------------------------------------------------------------
 
 const computeValues = (dataRow: any, legendIndex: number, transformValue = identity) =>
-  map(dataRow, ({ values }) => transformValue(parseNumber(values[legendIndex])))
+  map(dataRow, ({ values }) => transformValue(convertNanToNull(values[legendIndex])))
 
 const createGetProperty = (obj: object, property: string, defaultValue: unknown) =>
   defaults(obj, { [property]: defaultValue })[property] as any
@@ -329,14 +319,8 @@ export default class XapiStats {
       },
       abortSignal,
     })
-    const text = await resp.text()
-    try {
-      // starting from XAPI 23.31, the response is valid JSON
-      return JSON.parse(text)
-    } catch (error) {
-      // eslint-disable-next-line import/no-named-as-default-member -- https://github.com/json5/json5/issues/287
-      return JSON5.parse(text)
-    }
+    // eslint-disable-next-line import/no-named-as-default-member -- https://github.com/json5/json5/issues/287
+    return JSON5.parse(await resp.text())
   }
 
   // To avoid multiple requests, we keep a cache for the stats and
@@ -399,10 +383,7 @@ export default class XapiStats {
         abortSignal,
       })
 
-      const actualStep = parseNumber(json.meta.step)
-      if (actualStep !== step) {
-        throw new FaultyGranularity(`Unable to get the true granularity: ${actualStep}`)
-      }
+      const actualStep = json.meta.step as number
 
       if (json.data.length > 0) {
         // fetched data is organized from the newest to the oldest
@@ -426,15 +407,14 @@ export default class XapiStats {
 
           let stepStats = xoObjectStats[actualStep]
           let cacheStepStats = cacheXoObjectStats[actualStep]
-          const endTimestamp = parseNumber(json.meta.end)
-          if (stepStats === undefined || stepStats.endTimestamp !== endTimestamp) {
+          if (stepStats === undefined || stepStats.endTimestamp !== json.meta.end) {
             stepStats = xoObjectStats[actualStep] = {
-              endTimestamp,
+              endTimestamp: json.meta.end,
               interval: actualStep,
               canBeExpired: false,
             }
             cacheStepStats = cacheXoObjectStats[actualStep] = {
-              endTimestamp,
+              endTimestamp: json.meta.end,
               interval: actualStep,
               canBeExpired: true,
             }
@@ -458,6 +438,10 @@ export default class XapiStats {
           })
         })
       }
+
+      if (actualStep !== step) {
+        throw new FaultyGranularity(`Unable to get the true granularity: ${actualStep}`)
+      }
     } catch (error) {
       if (error instanceof Error && error.name === 'AbortError') {
         return

@xen-orchestra/lite/tsconfig.app.json

@@ -1,15 +1,13 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "../web-core/lib/**/*", "../web-core/lib/**/*.vue"],
+  "include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
     "baseUrl": ".",
-    "rootDir": "..",
     "paths": {
-      "@/*": ["./src/*"],
-      "@core/*": ["../web-core/lib/*"]
+      "@/*": ["./src/*"]
     }
   }
 }

@xen-orchestra/lite/vite.config.ts

@@ -23,7 +23,6 @@ export default defineConfig({
   resolve: {
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url)),
-      '@core': fileURLToPath(new URL('../web-core/lib', import.meta.url)),
     },
   },
 

@xen-orchestra/log/.USAGE.md

@@ -27,16 +27,6 @@ log.error('could not join server', {
 })
 ```
 
-A logging method has the following signature:
-
-```ts
-interface LoggingMethod {
-  (error): void
-
-  (message: string, data?: { error?: Error; [property: string]: any }): void
-}
-```
-
 ### Consumer
 
 Then, at application level, configure the logs are handled:

@xen-orchestra/log/README.md

@@ -45,16 +45,6 @@ log.error('could not join server', {
 })
 ```
 
-A logging method has the following signature:
-
-```ts
-interface LoggingMethod {
-  (error): void
-
-  (message: string, data?: { error?: Error; [property: string]: any }): void
-}
-```
-
 ### Consumer
 
 Then, at application level, configure the logs are handled:

@xen-orchestra/web-core/package.json

@@ -10,8 +10,7 @@
     }
   },
   "devDependencies": {
-    "vue": "^3.4.13",
-    "@vue/tsconfig": "^0.5.1"
+    "vue": "^3.4.13"
   },
   "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/web-core",
   "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
@@ -26,6 +25,6 @@
   },
   "license": "AGPL-3.0-or-later",
   "engines": {
-    "node": ">=18"
+    "node": ">=8.10"
   }
 }

@xen-orchestra/web-core/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["env.d.ts", "lib/**/*", "lib/**/*.vue"],
-  "exclude": ["lib/**/__tests__/*"],
-  "compilerOptions": {
-    "noEmit": true,
-    "baseUrl": ".",
-    "paths": {
-      "@core/*": ["./lib/*"]
-    }
-  }
-}

@xen-orchestra/web/tsconfig.app.json

@@ -1,22 +1,13 @@
 {
   "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": [
-    "env.d.ts",
-    "typed-router.d.ts",
-    "src/**/*",
-    "src/**/*.vue",
-    "../web-core/lib/**/*",
-    "../web-core/lib/**/*.vue"
-  ],
+  "include": ["env.d.ts", "typed-router.d.ts", "src/**/*", "src/**/*.vue"],
   "exclude": ["src/**/__tests__/*"],
   "compilerOptions": {
     "composite": true,
     "noEmit": true,
     "baseUrl": ".",
-    "rootDir": "..",
     "paths": {
-      "@/*": ["./src/*"],
-      "@core/*": ["../web-core/lib/*"]
+      "@/*": ["./src/*"]
     }
   }
 }

@xen-orchestra/web/vite.config.ts

@@ -11,7 +11,6 @@ export default defineConfig({
   resolve: {
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url)),
-      '@core': fileURLToPath(new URL('../web-core/lib', import.meta.url)),
     },
   },
 })

@xen-orchestra/xapi/vif.mjs

@@ -21,23 +21,12 @@ export default class Vif {
       MAC = '',
     } = {}
   ) {
-    if (device === undefined) {
-      const allowedDevices = await this.call('VM.get_allowed_VIF_devices', VM)
-      if (allowedDevices.length === 0) {
-        const error = new Error('could not find an allowed VIF device')
-        error.poolUuid = this.pool.uuid
-        error.vmRef = VM
-        throw error
-      }
-
-      device = allowedDevices[0]
-    }
-
     const [powerState, ...rest] = await Promise.all([
       this.getField('VM', VM, 'power_state'),
-      MTU ?? this.getField('network', network, 'MTU'),
+      device ?? (await this.call('VM.get_allowed_VIF_devices', VM))[0],
+      MTU ?? (await this.getField('network', network, 'MTU')),
     ])
-    ;[MTU] = rest
+    ;[device, MTU] = rest
 
     const vifRef = await this.call('VIF.create', {
       currently_attached: powerState === 'Suspended' ? currently_attached : undefined,

@xen-orchestra/xva/_formatBlockPath.mjs

@@ -1,3 +0,0 @@
-const formatCounter = counter => String(counter).padStart(8, '0')
-
-export const formatBlockPath = (basePath, counter) => `${basePath}/${formatCounter(counter)}`

@xen-orchestra/xva/_writeDisk.mjs

@@ -1,50 +1,30 @@
-import { formatBlockPath } from './_formatBlockPath.mjs'
 import { fromCallback } from 'promise-toolbox'
 import { readChunkStrict } from '@vates/read-chunk'
 import { xxhash64 } from 'hash-wasm'
 
-export const XVA_DISK_CHUNK_LENGTH = 1024 * 1024
-
-async function addEntry(pack, name, buffer) {
-  await fromCallback.call(pack, pack.entry, { name }, buffer)
-}
-
 async function writeBlock(pack, data, name) {
-  if (data.length < XVA_DISK_CHUNK_LENGTH) {
-    data = Buffer.concat([data, Buffer.alloc(XVA_DISK_CHUNK_LENGTH - data.length, 0)])
-  }
-  await addEntry(pack, name, data)
+  await fromCallback.call(pack, pack.entry, { name }, data)
   // weirdly, ocaml and xxhash return the bytes in reverse order to each other
   const hash = (await xxhash64(data)).toString('hex').toUpperCase()
-  await addEntry(pack, `${name}.xxhash`, Buffer.from(hash, 'utf8'))
+  await fromCallback.call(pack, pack.entry, { name: `${name}.xxhash` }, Buffer.from(hash, 'utf8'))
 }
-
 export default async function addDisk(pack, vhd, basePath) {
   let counter = 0
   let written
-  let lastBlockWrittenAt = Date.now()
-  const MAX_INTERVAL_BETWEEN_BLOCKS = 60 * 1000
-  const empty = Buffer.alloc(XVA_DISK_CHUNK_LENGTH, 0)
+  const chunk_length = 1024 * 1024
+  const empty = Buffer.alloc(chunk_length, 0)
   const stream = await vhd.rawContent()
   let lastBlockLength
   const diskSize = vhd.footer.currentSize
   let remaining = diskSize
   while (remaining > 0) {
-    lastBlockLength = Math.min(XVA_DISK_CHUNK_LENGTH, remaining)
-    const data = await readChunkStrict(stream, lastBlockLength)
+    const data = await readChunkStrict(stream, Math.min(chunk_length, remaining))
+    lastBlockLength = data.length
     remaining -= lastBlockLength
-    if (
-      // write first block
-      counter === 0 ||
-      // write all non empty blocks
-      !data.equals(empty) ||
-      // write one block from time to time to ensure there is no timeout
-      // occurring while passing empty blocks
-      Date.now() - lastBlockWrittenAt > MAX_INTERVAL_BETWEEN_BLOCKS
-    ) {
+
+    if (counter === 0 || !data.equals(empty)) {
       written = true
-      await writeBlock(pack, data, formatBlockPath(basePath, counter))
-      lastBlockWrittenAt = Date.now()
+      await writeBlock(pack, data, `${basePath}/${('' + counter).padStart(8, '0')}`)
     } else {
       written = false
     }
@@ -52,6 +32,6 @@ export default async function addDisk(pack, vhd, basePath) {
   }
   if (!written) {
     // last block must be present
-    await writeBlock(pack, empty, formatBlockPath(basePath, counter - 1))
+    writeBlock(pack, empty.slice(0, lastBlockLength), `${basePath}/${counter}`)
   }
 }

@xen-orchestra/xva/_writeOvaXml.mjs

@@ -9,7 +9,6 @@ import { DEFAULT_VDI } from './templates/vdi.mjs'
 import { DEFAULT_VIF } from './templates/vif.mjs'
 import { DEFAULT_VM } from './templates/vm.mjs'
 import toOvaXml from './_toOvaXml.mjs'
-import { XVA_DISK_CHUNK_LENGTH } from './_writeDisk.mjs'
 
 export default async function writeOvaXml(
   pack,
@@ -80,12 +79,11 @@ export default async function writeOvaXml(
   for (let index = 0; index < vhds.length; index++) {
     const userdevice = index + 1
     const vhd = vhds[index]
-    const alignedSize = Math.ceil(vdis[index].virtual_size / XVA_DISK_CHUNK_LENGTH) * XVA_DISK_CHUNK_LENGTH
     const vdi = defaultsDeep(
       {
         id: nextRef(),
-        // overwrite SR from an opaque ref to a ref:
-        snapshot: { ...vdis[index], SR: srObj.id, virtual_size: alignedSize },
+        // overwrite SR from an opaqref to a ref:
+        snapshot: { ...vdis[index], SR: srObj.id },
       },
       {
         snapshot: {

@xen-orchestra/xva/importVm.mjs

@@ -25,7 +25,8 @@ export async function importVm(vm, xapi, sr, network) {
   const str = await promise
   const matches = /OpaqueRef:[0-9a-z-]+/.exec(str)
   if (!matches) {
-    const error = new Error(`no opaque ref found in  ${str}`)
+    const error = new Error('no opaque ref found')
+    error.haystack = str
     throw error
   }
   return matches[0]

@xen-orchestra/xva/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/xva",
-  "version": "1.0.2",
+  "version": "1.0.0",
   "main": "index.js",
   "author": "",
   "license": "ISC",

CHANGELOG.md

@@ -1,46 +1,9 @@
 # ChangeLog
 
-## **5.91.2** (2024-02-09)
+## **5.91.0** (2024-01-31)
 
 <img id="latest" src="https://badgen.net/badge/channel/latest/yellow" alt="Channel: latest" />
 
-### Enhancements
-
-- [REST API] Add `/groups` collection [Forum#70500](https://xcp-ng.org/forum/post/70500)
-- [REST API] Add `/groups/:id/users` and `/users/:id/groups` collection [Forum#70500](https://xcp-ng.org/forum/post/70500)
-- [REST API] Expose messages associated to XAPI objects at `/:collection/:object/messages`
-
-### Bug fixes
-
-- [Import/VMWare] Fix `(Failure \"Expected string, got 'I(0)'\")` (PR [#7361](https://github.com/vatesfr/xen-orchestra/issues/7361))
-- [Plugin/load-balancer] Fixing `TypeError: Cannot read properties of undefined (reading 'high')` happening when trying to optimize a host with performance plan [#7359](https://github.com/vatesfr/xen-orchestra/issues/7359) (PR [#7362](https://github.com/vatesfr/xen-orchestra/pull/7362))
-- Changing the number of displayed items per page should send back to the first page [#7350](https://github.com/vatesfr/xen-orchestra/issues/7350)
-- [Plugin/load-balancer] Correctly create a _simple_ instead of a _density_ plan when it is selected (PR [#7358](https://github.com/vatesfr/xen-orchestra/pull/7358))
-
-### Released packages
-
-- xo-server 5.136.0
-- xo-server-load-balancer 0.8.1
-- xo-web 5.136.1
-
-## **5.91.1** (2024-02-06)
-
-### Bug fixes
-
-- [Import/VMWare] Fix `Error: task has been destroyed before completion` with XVA import [Forum#70513](https://xcp-ng.org/forum/post/70513)
-- [Import/VM] Fix `UUID_INVALID(VM, OpaqueRef:...)` error when importing from URL
-- [Proxies] Fix `xapi.getOrWaitObject is not a function` is not a function during deployment
-- [REST API] Fix empty object's tasks list
-- [REST API] Fix incorrect `href` in `/:collection/:object/tasks`
-
-### Released packages
-
-- @xen-orchestra/immutable-backups 1.0.1
-- @xen-orchestra/xva 1.0.2
-- xo-server 5.135.1
-
-## **5.91.0** (2024-01-31)
-
 ### Highlights
 
 - [Import/VMWare] Speed up import and make all imports thin [#7323](https://github.com/vatesfr/xen-orchestra/issues/7323)

CHANGELOG.unreleased.md

@@ -7,21 +7,17 @@
 
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
-- Disable search engine indexing via a `robots.txt`
-- [Stats] Support format used by XAPI 23.31
-- [REST API] Export host [SMT](https://en.wikipedia.org/wiki/Simultaneous_multithreading) status at `/hosts/:id/smt` [Forum#71374](https://xcp-ng.org/forum/post/71374)
-- [Home & REST API] `$container` field of an halted VM now points to a host if a VDI is on a local storage [Forum#71769](https://xcp-ng.org/forum/post/71769)
-- [Size Input] Ability to select two new units in the dropdown (`TiB`, `PiB`) (PR [#7382](https://github.com/vatesfr/xen-orchestra/pull/7382))
-- [Backup] Ability to set a number of retries for VM backup failures [#2139](https://github.com/vatesfr/xen-orchestra/issues/2139) (PR [#7308](https://github.com/vatesfr/xen-orchestra/pull/7308))
-
 ### Bug fixes
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
-- [Settings/XO Config] Sort backups from newest to oldest
-- [Plugins/audit] Don't log `tag.getAllConfigured` calls
-- [Remotes] Correctly clear error when the remote is tested with success
-- [Import/VMWare] Fix importing last snapshot (PR [#7370](https://github.com/vatesfr/xen-orchestra/pull/7370))
+- [Import/VM] Fix `UUID_INVALID(VM, OpaqueRef:...)` error when importing from URL
+- [Proxies] Fix `xapi.getOrWaitObject is not a function` is not a function during deployment
+- [REST API] Fix empty object's tasks list
+- [REST API] Fix incorrect `href` in `/:collection/:object/tasks`
+- [VM/Migration] Fix VDIs that were not migrated to the destination SR (PR [#7360](https://github.com/vatesfr/xen-orchestra/pull/7360))
+- [Home/VM] VMs migration from the home view will no longer execute a `migrate_send` unless it is necessary [Forum#8279](https://xcp-ng.org/forum/topic/8279/getting-errors-when-migrating-4-out-5-vmguest/)(PR [#7360](https://github.com/vatesfr/xen-orchestra/pull/7360))
+- [VM/migration] SR is no longer required if you select a migration network (PR [#7360](https://github.com/vatesfr/xen-orchestra/pull/7360))
 
 ### Packages to release
 
@@ -39,12 +35,9 @@
 
 <!--packages-start-->
 
-- @xen-orchestra/backups patch
-- @xen-orchestra/fs patch
-- @xen-orchestra/xapi patch
-- vhd-lib patch
-- xo-server minor
-- xo-server-audit patch
-- xo-web minor
+- @xen-orchestra/immutable-backups patch
+- @xen-orchestra/xva patch
+- xo-server patch
+- xo-web patch
 
 <!--packages-end-->

docs/load_balancing.md

@@ -34,8 +34,9 @@ But it's not the only way to see this: there is multiple possibilities to "optim
 
 - maybe you want to spread the VM load on the maximum number of server, to get the most of your hardware? (previous example)
 - maybe you want to reduce power consumption and migrate your VMs to the minimum number of hosts possible? (and shutdown useless hosts)
+- or maybe both, depending of your own schedule?
 
-Those ways can be also called modes: "performance" for 1 and "density" for number 2.
+Those ways can be also called modes: "performance" for 1, "density" for number 2 and "mixed" for the last.
 
 ## Configure a plan
 
@@ -46,6 +47,7 @@ A plan has:
 - a name
 - pool(s) where to apply the policy
 - a mode (see paragraph below)
+- a behavior (aggressive, normal, low)
 
 ### Plan modes
 
@@ -53,7 +55,7 @@ There are 3 modes possible:
 
 - performance
 - density
-- simple
+- mixed
 
 #### Performance
 
@@ -63,9 +65,14 @@ VMs are placed to use all possible resources. This means balance the load to giv
 
 This time, the objective is to use the least hosts possible, and to concentrate your VMs. In this mode, you can choose to shutdown unused (and compatible) hosts.
 
-#### Simple
+#### Mixed
 
-This mode allows you to use VM anti-affinity without using any load balancing mechanism. (see paragraph below)
+This mode allows you to use both performance and density, but alternatively, depending of a schedule. E.g:
+
+- **performance** from 6:00 AM to 7:00 PM
+- **density** from 7:01 PM to 5:59 AM
+
+In this case, you'll have the best of both when needed (energy saving during the night and performance during the day).
 
 ### Threshold
 
@@ -80,10 +87,6 @@ If the CPU threshold is set to 90%, the load balancer will be only triggered if
 
 For free memory, it will be triggered if there is **less** free RAM than the threshold.
 
-### Exclusion
-
-If you want to prevent load balancing from triggering migrations on a particular host or VM, it is possible to exclude it from load balancing. It can be configured via the "Excluded hosts" parameter in each plan, and in the "Ignored VM tags" parameter which is common to every plan.
-
 ### Timing
 
 The global situation (resource usage) is examined **every minute**.

docs/xoa.md

@@ -93,21 +93,6 @@ Follow the instructions:
 
 You can also download XOA from xen-orchestra.com in an XVA file. Once you've got the XVA file, you can import it with `xe vm-import filename=xoa_unified.xva` or via XenCenter.
 
-If you want to use static IP address for your appliance:
-
-```sh
-xe vm-param-set uuid="$uuid" \
-  xenstore-data:vm-data/ip="$ip" \
-  xenstore-data:vm-data/netmask="$netmask" \
-  xenstore-data:vm-data/gateway="$gateway"
-```
-
-If you want to replace the default DNS server:
-
-```sh
-xe vm-param-set uuid="$uuid" xenstore-data:vm-data/dns="$dns"
-```
-
 After the VM is imported, you just need to start it with `xe vm-start vm="XOA"` or with XenCenter.
 
 ## First console connection

package.json

@@ -1,6 +1,4 @@
 {
-  "name": "xen-orchestra",
-  "version": "0.0.0",
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@babel/eslint-parser": "^7.13.8",
@@ -96,7 +94,7 @@
   },
   "private": true,
   "scripts": {
-    "build": "TURBO_TELEMETRY_DISABLED=1 turbo run build --scope xo-server --scope xo-server-'*' --scope xo-web",
+    "build": "turbo run build --scope xo-server --scope xo-server-'*' --scope xo-web",
     "build:xo-lite": "turbo run build --scope @xen-orchestra/lite",
     "clean": "scripts/run-script.js --parallel clean",
     "dev": "scripts/run-script.js --parallel --concurrency 0 --verbose dev",

packages/vhd-lib/chain.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { relativeFromFile } = require('@xen-orchestra/fs/path')
+const { dirname, relative } = require('path')
 
 const { openVhd } = require('./openVhd')
 const { DISK_TYPES } = require('./_constants')
@@ -21,7 +21,7 @@ module.exports = async function chain(parentHandler, parentPath, childHandler, c
       }
       await childVhd.readBlockAllocationTable()
 
-      const parentName = relativeFromFile(childPath, parentPath)
+      const parentName = relative(dirname(childPath), parentPath)
       header.parentUuid = parentVhd.footer.uuid
       header.parentUnicodeName = parentName
       await childVhd.setUniqueParentLocator(parentName)

packages/xo-server-audit/src/index.js

@@ -72,7 +72,6 @@ const DEFAULT_BLOCKED_LIST = {
   'system.getServerTimezone': true,
   'system.getServerVersion': true,
   'system.getVersion': true,
-  'tag.getAllConfigured': true,
   'test.getPermissionsForUser': true,
   'user.getAll': true,
   'user.getAuthenticationTokens': true,

packages/xo-server-load-balancer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-load-balancer",
-  "version": "0.8.1",
+  "version": "0.8.0",
   "license": "AGPL-3.0-or-later",
   "description": "Load balancer for XO-Server",
   "keywords": [

packages/xo-server-load-balancer/src/index.js

@@ -12,8 +12,6 @@ import { EXECUTION_DELAY, debug } from './utils'
 
 const PERFORMANCE_MODE = 0
 const DENSITY_MODE = 1
-const SIMPLE_MODE = 2
-const MODES = { 'Performance mode': PERFORMANCE_MODE, 'Density mode': DENSITY_MODE, 'Simple mode': SIMPLE_MODE }
 
 // ===================================================================
 
@@ -37,7 +35,7 @@ export const configurationSchema = {
           },
 
           mode: {
-            enum: Object.keys(MODES),
+            enum: ['Performance mode', 'Density mode', 'Simple mode'],
             title: 'Mode',
           },
 
@@ -149,7 +147,7 @@ class LoadBalancerPlugin {
 
     if (plans) {
       for (const plan of plans) {
-        this._addPlan(MODES[plan.mode], plan)
+        this._addPlan(plan.mode === 'Performance mode' ? PERFORMANCE_MODE : DENSITY_MODE, plan)
       }
     }
   }

packages/xo-server-load-balancer/src/performance-plan.js

@@ -178,7 +178,7 @@ export default class PerformancePlan extends Plan {
       const state = this._getThresholdState(exceededAverages)
       if (
         destinationAverages.cpu + vmAverages.cpu >= this._thresholds.cpu.low ||
-        destinationAverages.memoryFree - vmAverages.memory <= this._thresholds.memoryFree.high ||
+        destinationAverages.memoryFree - vmAverages.memory <= this._thresholds.memory.high ||
         (!state.cpu &&
           !state.memory &&
           (exceededAverages.cpu - vmAverages.cpu < destinationAverages.cpu + vmAverages.cpu ||

packages/xo-server/config.toml

@@ -143,7 +143,6 @@ port = 80
 requestTimeout = 0
 
 [http.mounts]
-'/robots.txt' = './robots.txt'
 '/' = '../xo-web/dist/'
 '/v6' = '../../@xen-orchestra/web/dist/'
 

packages/xo-server/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "xo-server",
-  "version": "5.136.0",
+  "version": "5.135.0",
   "license": "AGPL-3.0-or-later",
   "description": "Server part of Xen-Orchestra",
   "keywords": [
@@ -53,7 +53,7 @@
     "@xen-orchestra/template": "^0.1.0",
     "@xen-orchestra/vmware-explorer": "^0.4.0",
     "@xen-orchestra/xapi": "^4.2.0",
-    "@xen-orchestra/xva": "^1.0.2",
+    "@xen-orchestra/xva": "^1.0.0",
     "ajv": "^8.0.3",
     "app-conf": "^2.3.0",
     "async-iterator-to-stream": "^1.0.1",

packages/xo-server/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /

packages/xo-server/src/_handleBackupLog.mjs

@@ -27,7 +27,7 @@ async function sendToNagios(app, jobName, vmBackupInfo) {
       jobName
     )
   } catch (error) {
-    warn('sendToNagios:', { error })
+    warn('sendToNagios:', error)
   }
 }
 

packages/xo-server/src/api/backup-ng.mjs

@@ -27,11 +27,6 @@ const SCHEMA_SETTINGS = {
           minimum: 1,
           optional: true,
         },
-        nRetriesVmBackupFailures: {
-          minimum: 0,
-          optional: true,
-          type: 'number',
-        },
         preferNbd: {
           type: 'boolean',
           optional: true,

packages/xo-server/src/logs-cli.mjs

@@ -48,18 +48,15 @@ const getLogs = (db, args) => {
 
 const deleteLogs = (db, args) =>
   new Promise(resolve => {
-    let nDeleted = 0
-    let nRunning = 1
+    let count = 1
     const cb = () => {
-      if (--nRunning === 0) {
-        console.log(nDeleted.toLocaleString(), 'deleted entries')
+      if (--count === 0) {
         resolve()
       }
     }
 
     const deleteEntry = key => {
-      ++nDeleted
-      ++nRunning
+      ++count
       db.del(key, cb)
     }
 

packages/xo-server/src/xapi-object-to-xo.mjs

@@ -328,34 +328,6 @@ const TRANSFORMS = {
 
     const { creation } = xoData.extract(obj) ?? {}
 
-    let $container
-    if (obj.resident_on !== 'OpaqueRef:NULL') {
-      // resident_on is set when the VM is running (or paused or suspended on a host)
-      $container = link(obj, 'resident_on')
-    } else {
-      // if the VM is halted, the $container is the pool
-      $container = link(obj, 'pool')
-
-      // unless one of its VDI is on a non shared SR
-      //
-      // linked objects may not be there when this code run, and it will only be
-      // refreshed when the VM XAPI record change, this value is not guaranteed
-      // to be up-to-date, but it practice it appears to work fine thanks to
-      // `VBDs` and `current_operations` changing when a VDI is
-      // added/removed/migrated
-      for (const vbd of obj.$VBDs) {
-        const sr = vbd?.$VDI?.$SR
-        if (sr !== undefined && !sr.shared) {
-          const pbd = sr.$PBDs[0]
-          const hostId = pbd && link(pbd, 'host')
-          if (hostId !== undefined) {
-            $container = hostId
-            break
-          }
-        }
-      }
-    }
-
     const vm = {
       // type is redefined after for controllers/, templates &
       // snapshots.
@@ -450,7 +422,8 @@ const TRANSFORMS = {
       xenTools,
       ...getVmGuestToolsProps(obj),
 
-      $container,
+      // TODO: handle local VMs (`VM.get_possible_hosts()`).
+      $container: isRunning ? link(obj, 'resident_on') : link(obj, 'pool'),
       $VBDs: link(obj, 'VBDs'),
 
       // TODO: dedupe

packages/xo-server/src/xapi-stats.mjs

@@ -45,17 +45,7 @@ const RRD_POINTS_PER_STEP = {
 // Utils
 // -------------------------------------------------------------------
 
-function parseNumber(value) {
-  // Starting from XAPI 23.31, numbers in the JSON payload are encoded as
-  // strings to support NaN, Infinity and -Infinity
-  if (typeof value === 'string') {
-    const asNumber = +value
-    if (isNaN(asNumber) && value !== 'NaN') {
-      throw new Error('cannot parse number: ' + value)
-    }
-    value = asNumber
-  }
-
+function convertNanToNull(value) {
   return isNaN(value) ? null : value
 }
 
@@ -68,7 +58,7 @@ async function getServerTimestamp(xapi, hostRef) {
 // -------------------------------------------------------------------
 
 const computeValues = (dataRow, legendIndex, transformValue = identity) =>
-  map(dataRow, ({ values }) => transformValue(parseNumber(values[legendIndex])))
+  map(dataRow, ({ values }) => transformValue(convertNanToNull(values[legendIndex])))
 
 const combineStats = (stats, path, combineValues) => zipWith(...map(stats, path), (...values) => combineValues(values))
 
@@ -255,15 +245,7 @@ export default class XapiStats {
           start: timestamp,
         },
       })
-      .then(response => response.text())
-      .then(data => {
-        try {
-          // starting from XAPI 23.31, the response is valid JSON
-          return JSON.parse(data)
-        } catch (_) {
-          return JSON5.parse(data)
-        }
-      })
+      .then(response => response.text().then(JSON5.parse))
       .catch(err => {
         delete this.#hostCache[hostUuid][step]
         throw err
@@ -317,7 +299,7 @@ export default class XapiStats {
     // To avoid crossing over the boundary, we ask for one less step
     const optimumTimestamp = currentTimeStamp - maxDuration + step
     const json = await this._getJson(xapi, host, optimumTimestamp, step)
-    const actualStep = parseNumber(json.meta.step)
+    const actualStep = json.meta.step
 
     if (actualStep !== step) {
       throw new FaultyGranularity(`Unable to get the true granularity: ${actualStep}`)
@@ -344,10 +326,9 @@ export default class XapiStats {
           return
         }
 
-        const endTimestamp = parseNumber(json.meta.end)
-        if (stepStats === undefined || stepStats.endTimestamp !== endTimestamp) {
+        if (stepStats === undefined || stepStats.endTimestamp !== json.meta.end) {
           stepStats = {
-            endTimestamp,
+            endTimestamp: json.meta.end,
             interval: actualStep,
             stats: {},
           }

packages/xo-server/src/xapi/index.mjs

@@ -495,10 +495,8 @@ export default class Xapi extends XapiBase {
       bypassAssert = false,
     }
   ) {
+    const srRef = sr !== undefined ? hostXapi.getObject(sr).$ref : undefined
     const getDefaultSrRef = once(() => {
-      if (sr !== undefined) {
-        return hostXapi.getObject(sr).$ref
-      }
       const defaultSr = host.$pool.$default_SR
       if (defaultSr === undefined) {
         throw new Error(`This operation requires a default SR to be set on the pool ${host.$pool.name_label}`)
@@ -506,6 +504,28 @@ export default class Xapi extends XapiBase {
       return defaultSr.$ref
     })
 
+    // VDIs/SRs mapping
+    // For VDI:
+    // - If a map of VDI -> SR was explicitly passed: use it
+    // - Else if SR was explicitly passed: use it
+    // - Else if VDI SR is reachable from the destination host: use it
+    // - Else: use the migration main SR or the pool's default SR (error if none of them is defined)
+    function getMigrationSrRef(vdi) {
+      if (mapVdisSrs[vdi.$id] !== undefined) {
+        return hostXapi.getObject(mapVdisSrs[vdi.$id]).$ref
+      }
+
+      if (srRef !== undefined) {
+        return srRef
+      }
+
+      if (isSrConnected(vdi.$SR)) {
+        return vdi.$SR.$ref
+      }
+
+      return getDefaultSrRef()
+    }
+
     const hostPbds = new Set(host.PBDs)
     const connectedSrs = new Map()
     const isSrConnected = sr => {
@@ -518,10 +538,6 @@ export default class Xapi extends XapiBase {
     }
 
     // VDIs/SRs mapping
-    // For VDI:
-    // - If SR was explicitly passed: use it
-    // - Else if VDI SR is reachable from the destination host: use it
-    // - Else: use the migration main SR or the pool's default SR (error if none of them is defined)
     // For VDI-snapshot:
     // - If VDI-snapshot is an orphan snapshot: same logic as a VDI
     // - Else: don't add it to the map (VDI -> SR). It will be managed by the XAPI (snapshot will be migrated to the same SR as its parent active VDI)
@@ -534,12 +550,7 @@ export default class Xapi extends XapiBase {
         if (vdi.$snapshot_of !== undefined) {
           continue
         }
-        vdis[vdi.$ref] =
-          mapVdisSrs[vdi.$id] !== undefined
-            ? hostXapi.getObject(mapVdisSrs[vdi.$id]).$ref
-            : isSrConnected(vdi.$SR)
-              ? vdi.$SR.$ref
-              : getDefaultSrRef()
+        vdis[vdi.$ref] = getMigrationSrRef(vdi)
       }
     }
 

packages/xo-server/src/xo-mixins/api.mjs

@@ -410,9 +410,7 @@ export default class Api {
       // 2021-02-11: Work-around: ECONNREFUSED error can be triggered by
       // 'host.stats' method because there is no connection to the host during a
       // toolstack restart and xo-web may call it often
-      // 2024-02-05: Work-around: in case of XO Proxy errors, `proxy.getApplianceUpdaterState` will
-      // flood the logs.
-      if (name !== 'pool.listMissingPatches' && name !== 'host.stats' && name !== 'proxy.getApplianceUpdaterState') {
+      if (name !== 'pool.listMissingPatches' && name !== 'host.stats') {
         this._logger.error(message, {
           ...data,
           duration: Date.now() - startTime,

packages/xo-server/src/xo-mixins/migrate-vm.mjs

@@ -249,7 +249,7 @@ export default class MigrateVm {
             const disk = chainByNode[diskIndex]
             const { capacity, descriptionLabel, fileName, nameLabel, path, datastore, isFull } = disk
             if (isFull) {
-              vhd = await VhdEsxiRaw.open(esxi, datastore, path + '/' + fileName, { thin: false })
+              vhd = await VhdEsxiRaw.open(esxi, datastore, path + '/' + fileName)
               // we don't need to read the BAT with the importVdiThroughXva process
               const vdiMetadata = {
                 name_description: 'fromESXI' + descriptionLabel,
@@ -258,14 +258,11 @@ export default class MigrateVm {
                 virtual_size: capacity,
               }
               vdi = await importVdiThroughXva(vdiMetadata, vhd, xapi, sr)
-
               // it can fail before the vdi is connected to the vm
               $defer.onFailure.call(xapi, 'VDI_destroy', vdi.$ref)
               await xapi.VBD_create({
                 VDI: vdi.$ref,
                 VM: vm.$ref,
-                device: `xvd${String.fromCharCode('a'.charCodeAt(0) + userdevice)}`,
-                userdevice: String(userdevice < 3 ? userdevice : userdevice + 1),
               })
             } else {
               vhd = await openDeltaVmdkasVhd(esxi, datastore, path + '/' + fileName, parentVhd, {
@@ -280,7 +277,7 @@ export default class MigrateVm {
             const stream = vhd.stream()
             await vdi.$importContent(stream, { format: VDI_FORMAT_VHD })
           }
-          return { vdi, vhd }
+          return vhd
         })
       )
     )
@@ -315,8 +312,6 @@ export default class MigrateVm {
               await xapi.VBD_create({
                 VDI: vdi.$ref,
                 VM: vm.$ref,
-                device: `xvd${String.fromCharCode('a'.charCodeAt(0) + userdevice)}`,
-                userdevice: String(userdevice < 3 ? userdevice : userdevice + 1),
               })
             } else {
               if (parentVhd === undefined) {

packages/xo-server/src/xo-mixins/remotes.mjs

@@ -1,6 +1,5 @@
 import asyncMapSettled from '@xen-orchestra/async-map/legacy.js'
 import { basename } from 'path'
-import { createLogger } from '@xen-orchestra/log'
 import { format, parse } from 'xo-remote-parser'
 import {
   DEFAULT_ENCRYPTION_ALGORITHM,
@@ -18,35 +17,17 @@ import { Remotes } from '../models/remote.mjs'
 
 // ===================================================================
 
-const { warn } = createLogger('xo:mixins:remotes')
-
 const obfuscateRemote = ({ url, ...remote }) => {
   const parsedUrl = parse(url)
   remote.url = format(sensitiveValues.obfuscate(parsedUrl))
   return remote
 }
 
-// these properties should be defined on the remote object itself and not as
-// part of the remote URL
-//
-// there is a bug somewhere that keep putting them into the URL, this list
-// is here to help track it
-const INVALID_URL_PARAMS = ['benchmarks', 'id', 'info', 'name', 'proxy', 'enabled', 'error', 'url']
-
-function validateUrl(url) {
-  const parsedUrl = parse(url)
-
-  const { path } = parsedUrl
+function validatePath(url) {
+  const { path } = parse(url)
   if (path !== undefined && basename(path) === 'xo-vm-backups') {
     throw invalidParameters('remote url should not end with xo-vm-backups')
   }
-
-  for (const param of INVALID_URL_PARAMS) {
-    if (Object.hasOwn(parsedUrl, param)) {
-      // log with stack trace
-      warn(new Error('invalid remote URL param ' + param))
-    }
-  }
 }
 
 export default class {
@@ -201,22 +182,6 @@ export default class {
     if (remote === undefined) {
       throw noSuchObject(id, 'remote')
     }
-
-    const parsedUrl = parse(remote.url)
-    let fixed = false
-    for (const param of INVALID_URL_PARAMS) {
-      if (Object.hasOwn(parsedUrl, param)) {
-        // delete the value to trace its real origin when it's added back
-        // with `updateRemote()`
-        delete parsedUrl[param]
-        fixed = true
-      }
-    }
-    if (fixed) {
-      remote.url = format(parsedUrl)
-      this._remotes.update(remote).catch(warn)
-    }
-
     return remote
   }
 
@@ -237,7 +202,7 @@ export default class {
   }
 
   async createRemote({ name, options, proxy, url }) {
-    validateUrl(url)
+    validatePath(url)
 
     const params = {
       enabled: false,
@@ -254,10 +219,6 @@ export default class {
   }
 
   updateRemote(id, { enabled, name, options, proxy, url }) {
-    if (url !== undefined) {
-      validateUrl(url)
-    }
-
     const handlers = this._handlers
     const handler = handlers[id]
     if (handler !== undefined) {
@@ -277,7 +238,7 @@ export default class {
   @synchronized()
   async _updateRemote(id, { url, ...props }) {
     if (url !== undefined) {
-      validateUrl(url)
+      validatePath(url)
     }
 
     const remote = await this._getRemote(id)

packages/xo-server/src/xo-mixins/rest-api.mjs

@@ -100,17 +100,6 @@ async function sendObjects(iterable, req, res, path = req.path) {
   return pipeline(makeObjectsStream(iterable, makeResult, json, res), res)
 }
 
-function handleArray(array, filter, limit) {
-  if (filter !== undefined) {
-    array = array.filter(filter)
-  }
-  if (limit < array.length) {
-    array.length = limit
-  }
-
-  return array
-}
-
 const handleOptionalUserFilter = filter => filter && CM.parse(filter).createPredicate()
 
 const subRouter = (app, path) => {
@@ -171,7 +160,77 @@ export default class RestApi {
       )
     })
 
-    const collections = { __proto__: null }
+    const types = [
+      'host',
+      'network',
+      'pool',
+      'SR',
+      'VBD',
+      'VDI-snapshot',
+      'VDI',
+      'VIF',
+      'VM-snapshot',
+      'VM-template',
+      'VM',
+    ]
+    const collections = Object.fromEntries(
+      types.map(type => {
+        const id = type.toLocaleLowerCase() + 's'
+        return [id, { id, isCorrectType: _ => _.type === type, type }]
+      })
+    )
+
+    collections.backup = { id: 'backup' }
+    collections.restore = { id: 'restore' }
+    collections.tasks = { id: 'tasks' }
+    collections.users = { id: 'users' }
+
+    collections.hosts.routes = {
+      __proto__: null,
+
+      async 'audit.txt'(req, res) {
+        const host = req.xapiObject
+
+        res.setHeader('content-type', 'text/plain')
+        await pipeline(await host.$xapi.getResource('/audit_log', { host }), compressMaybe(req, res))
+      },
+
+      async 'logs.tar'(req, res) {
+        const host = req.xapiObject
+
+        res.setHeader('content-type', 'application/x-tar')
+        await pipeline(await host.$xapi.getResource('/host_logs_download', { host }), compressMaybe(req, res))
+      },
+
+      async missing_patches(req, res) {
+        await app.checkFeatureAuthorization('LIST_MISSING_PATCHES')
+
+        const host = req.xapiObject
+        res.json(await host.$xapi.listMissingPatches(host))
+      },
+    }
+
+    collections.pools.routes = {
+      __proto__: null,
+
+      async missing_patches(req, res) {
+        await app.checkFeatureAuthorization('LIST_MISSING_PATCHES')
+
+        const xapi = req.xapiObject.$xapi
+        const missingPatches = new Map()
+        await asyncEach(Object.values(xapi.objects.indexes.type.host ?? {}), async host => {
+          try {
+            for (const patch of await xapi.listMissingPatches(host)) {
+              const { uuid: key = `${patch.name}-${patch.version}-${patch.release}` } = patch
+              missingPatches.set(key, patch)
+            }
+          } catch (error) {
+            console.warn(host.uuid, error)
+          }
+        })
+        res.json(Array.from(missingPatches.values()))
+      },
+    }
 
     const withParams = (fn, paramsSchema) => {
       fn.params = paramsSchema
@@ -179,235 +238,68 @@ export default class RestApi {
       return fn
     }
 
-    {
-      const types = [
-        'host',
-        'message',
-        'network',
-        'pool',
-        'SR',
-        'VBD',
-        'VDI-snapshot',
-        'VDI',
-        'VIF',
-        'VM-snapshot',
-        'VM-template',
-        'VM',
-      ]
-      function getObject(id, req) {
-        const { type } = this
-        const object = app.getObject(id, type)
+    collections.pools.actions = {
+      __proto__: null,
 
-        // add also the XAPI version of the object
-        req.xapiObject = app.getXapiObject(object)
+      create_vm: withParams(
+        defer(async ($defer, { xapiObject: { $xapi } }, { affinity, boot, install, template, ...params }, req) => {
+          params.affinityHost = affinity
+          params.installRepository = install?.repository
 
-        return object
-      }
-      function getObjects(filter, limit) {
-        return app.getObjects({
-          filter: every(this.isCorrectType, filter),
-          limit,
-        })
-      }
-      async function messages(req, res) {
-        const {
-          object: { id },
-          query,
-        } = req
-        await sendObjects(
-          app.getObjects({
-            filter: every(_ => _.type === 'message' && _.$object === id, handleOptionalUserFilter(query.filter)),
-            limit: ifDef(query.limit, Number),
-          }),
-          req,
-          res,
-          '/messages'
-        )
-      }
-      for (const type of types) {
-        const id = type.toLocaleLowerCase() + 's'
+          const vm = await $xapi.createVm(template, params, undefined, req.user.id)
+          $defer.onFailure.call($xapi, 'VM_destroy', vm.$ref)
 
-        collections[id] = { getObject, getObjects, routes: { messages }, isCorrectType: _ => _.type === type, type }
-      }
-
-      collections.hosts.routes = {
-        ...collections.hosts.routes,
-
-        async 'audit.txt'(req, res) {
-          const host = req.xapiObject
-
-          res.setHeader('content-type', 'text/plain')
-          await pipeline(await host.$xapi.getResource('/audit_log', { host }), compressMaybe(req, res))
-        },
-
-        async 'logs.tar'(req, res) {
-          const host = req.xapiObject
-
-          res.setHeader('content-type', 'application/x-tar')
-          await pipeline(await host.$xapi.getResource('/host_logs_download', { host }), compressMaybe(req, res))
-        },
-
-        async missing_patches(req, res) {
-          await app.checkFeatureAuthorization('LIST_MISSING_PATCHES')
-
-          const host = req.xapiObject
-          res.json(await host.$xapi.listMissingPatches(host))
-        },
-
-        async smt({ xapiObject }, res) {
-          res.json({ enabled: await xapiObject.$xapi.isHyperThreadingEnabled(xapiObject.$id) })
-        },
-      }
-
-      collections.pools.routes = {
-        ...collections.pools.routes,
-
-        async missing_patches(req, res) {
-          await app.checkFeatureAuthorization('LIST_MISSING_PATCHES')
-
-          const xapi = req.xapiObject.$xapi
-          const missingPatches = new Map()
-          await asyncEach(Object.values(xapi.objects.indexes.type.host ?? {}), async host => {
-            try {
-              for (const patch of await xapi.listMissingPatches(host)) {
-                const { uuid: key = `${patch.name}-${patch.version}-${patch.release}` } = patch
-                missingPatches.set(key, patch)
-              }
-            } catch (error) {
-              console.warn(host.uuid, error)
-            }
-          })
-          res.json(Array.from(missingPatches.values()))
-        },
-      }
-
-      collections.pools.actions = {
-        create_vm: withParams(
-          defer(async ($defer, { xapiObject: { $xapi } }, { affinity, boot, install, template, ...params }, req) => {
-            params.affinityHost = affinity
-            params.installRepository = install?.repository
-
-            const vm = await $xapi.createVm(template, params, undefined, req.user.id)
-            $defer.onFailure.call($xapi, 'VM_destroy', vm.$ref)
-
-            if (boot) {
-              await $xapi.callAsync('VM.start', vm.$ref, false, false)
-            }
-
-            return vm.uuid
-          }),
-          {
-            affinity: { type: 'string', optional: true },
-            auto_poweron: { type: 'boolean', optional: true },
-            boot: { type: 'boolean', default: false },
-            clone: { type: 'boolean', default: true },
-            install: {
-              type: 'object',
-              optional: true,
-              properties: {
-                method: { enum: ['cdrom', 'network'] },
-                repository: { type: 'string' },
-              },
-            },
-            memory: { type: 'integer', optional: true },
-            name_description: { type: 'string', minLength: 0, optional: true },
-            name_label: { type: 'string' },
-            template: { type: 'string' },
+          if (boot) {
+            await $xapi.callAsync('VM.start', vm.$ref, false, false)
           }
-        ),
-        emergency_shutdown: async ({ xapiObject }) => {
-          await app.checkFeatureAuthorization('POOL_EMERGENCY_SHUTDOWN')
 
-          await xapiObject.$xapi.pool_emergencyShutdown()
-        },
-        rolling_update: async ({ object }) => {
-          await app.checkFeatureAuthorization('ROLLING_POOL_UPDATE')
-
-          await app.rollingPoolUpdate(object)
-        },
-      }
-      collections.vms.actions = {
-        clean_reboot: ({ xapiObject: vm }) => vm.$callAsync('clean_reboot').then(noop),
-        clean_shutdown: ({ xapiObject: vm }) => vm.$callAsync('clean_shutdown').then(noop),
-        hard_reboot: ({ xapiObject: vm }) => vm.$callAsync('hard_reboot').then(noop),
-        hard_shutdown: ({ xapiObject: vm }) => vm.$callAsync('hard_shutdown').then(noop),
-        snapshot: withParams(
-          async ({ xapiObject: vm }, { name_label }) => {
-            const ref = await vm.$snapshot({ name_label })
-            return vm.$xapi.getField('VM', ref, 'uuid')
+          return vm.uuid
+        }),
+        {
+          affinity: { type: 'string', optional: true },
+          auto_poweron: { type: 'boolean', optional: true },
+          boot: { type: 'boolean', default: false },
+          clone: { type: 'boolean', default: true },
+          install: {
+            type: 'object',
+            optional: true,
+            properties: {
+              method: { enum: ['cdrom', 'network'] },
+              repository: { type: 'string' },
+            },
           },
-          { name_label: { type: 'string', optional: true } }
-        ),
-        start: ({ xapiObject: vm }) => vm.$callAsync('start', false, false).then(noop),
-      }
-    }
+          memory: { type: 'integer', optional: true },
+          name_description: { type: 'string', minLength: 0, optional: true },
+          name_label: { type: 'string' },
+          template: { type: 'string' },
+        }
+      ),
+      emergency_shutdown: async ({ xapiObject }) => {
+        await app.checkFeatureAuthorization('POOL_EMERGENCY_SHUTDOWN')
 
-    collections.backup = {}
-    collections.groups = {
-      getObject(id) {
-        return app.getGroup(id)
+        await xapiObject.$xapi.pool_emergencyShutdown()
       },
-      async getObjects(filter, limit) {
-        return handleArray(await app.getAllGroups(), filter, limit)
+      rolling_update: async ({ xoObject }) => {
+        await app.checkFeatureAuthorization('ROLLING_POOL_UPDATE')
+
+        await app.rollingPoolUpdate(xoObject)
       },
-      routes: {
-        async users(req, res) {
-          const { filter, limit } = req.query
-          await sendObjects(
-            handleArray(
-              await Promise.all(req.object.users.map(id => app.getUser(id).then(getUserPublicProperties))),
-              handleOptionalUserFilter(filter),
-              ifDef(limit, Number)
-            ),
-            req,
-            res,
-            '/users'
-          )
+    }
+    collections.vms.actions = {
+      __proto__: null,
+
+      clean_reboot: ({ xapiObject: vm }) => vm.$callAsync('clean_reboot').then(noop),
+      clean_shutdown: ({ xapiObject: vm }) => vm.$callAsync('clean_shutdown').then(noop),
+      hard_reboot: ({ xapiObject: vm }) => vm.$callAsync('hard_reboot').then(noop),
+      hard_shutdown: ({ xapiObject: vm }) => vm.$callAsync('hard_shutdown').then(noop),
+      snapshot: withParams(
+        async ({ xapiObject: vm }, { name_label }) => {
+          const ref = await vm.$snapshot({ name_label })
+          return vm.$xapi.getField('VM', ref, 'uuid')
         },
-      },
-    }
-    collections.restore = {}
-    collections.tasks = {}
-    collections.users = {
-      getObject(id) {
-        return app.getUser(id).then(getUserPublicProperties)
-      },
-      async getObjects(filter, limit) {
-        return handleArray(await app.getAllUsers(), filter, limit)
-      },
-      routes: {
-        async groups(req, res) {
-          const { filter, limit } = req.query
-          await sendObjects(
-            handleArray(
-              await Promise.all(req.object.groups.map(id => app.getGroup(id))),
-              handleOptionalUserFilter(filter),
-              ifDef(limit, Number)
-            ),
-            req,
-            res,
-            '/groups'
-          )
-        },
-      },
-    }
-
-    // normalize collections
-    for (const id of Object.keys(collections)) {
-      const collection = collections[id]
-
-      // inject id into the collection
-      collection.id = id
-
-      // set null as prototypes to speed-up look-ups
-      Object.setPrototypeOf(collection, null)
-      const { actions, routes } = collection
-      if (actions !== undefined) {
-        Object.setPrototypeOf(actions, null)
-      }
-      if (routes !== undefined) {
-        Object.setPrototypeOf(routes, null)
-      }
+        { name_label: { type: 'string', optional: true } }
+      ),
+      start: ({ xapiObject: vm }) => vm.$callAsync('start', false, false).then(noop),
     }
 
     api.param('collection', (req, res, next) => {
@@ -420,14 +312,14 @@ export default class RestApi {
         next()
       }
     })
-    api.param('object', async (req, res, next) => {
+    api.param('object', (req, res, next) => {
       const id = req.params.object
+      const { type } = req.collection
       try {
-        // eslint-disable-next-line require-atomic-updates
-        req.object = await req.collection.getObject(id, req)
-        return next()
+        req.xapiObject = app.getXapiObject((req.xoObject = app.getObject(id, type)))
+        next()
       } catch (error) {
-        if (noSuchObject.is(error, { id })) {
+        if (noSuchObject.is(error, { id, type })) {
           next('route')
         } else {
           next(error)
@@ -586,12 +478,39 @@ export default class RestApi {
         }, true)
       )
 
+    api
+      .get(
+        '/users',
+        wrap(async (req, res) => {
+          let users = await app.getAllUsers()
+
+          const { filter, limit } = req.query
+          if (filter !== undefined) {
+            users = users.filter(CM.parse(filter).createPredicate())
+          }
+          if (limit < users.length) {
+            users.length = limit
+          }
+
+          sendObjects(users.map(getUserPublicProperties), req, res)
+        })
+      )
+      .get(
+        '/users/:id',
+        wrap(async (req, res) => {
+          res.json(getUserPublicProperties(await app.getUser(req.params.id)))
+        })
+      )
+
     api.get(
       '/:collection',
       wrap(async (req, res) => {
         const { query } = req
         await sendObjects(
-          await req.collection.getObjects(handleOptionalUserFilter(query.filter), ifDef(query.limit, Number)),
+          await app.getObjects({
+            filter: every(req.collection.isCorrectType, handleOptionalUserFilter(query.filter)),
+            limit: ifDef(query.limit, Number),
+          }),
           req,
           res
         )
@@ -644,7 +563,7 @@ export default class RestApi {
     )
 
     api.get('/:collection/:object', (req, res) => {
-      let result = req.object
+      let result = req.xoObject
 
       // add locations of sub-routes for discoverability
       const { routes } = req.collection
@@ -699,7 +618,7 @@ export default class RestApi {
       '/:collection/:object/tasks',
       wrap(async (req, res) => {
         const { query } = req
-        const objectId = req.object.id
+        const objectId = req.xoObject.id
         const tasks = app.tasks.list({
           filter: every(
             _ => _.status === 'pending' && _.properties.objectId === objectId,
@@ -739,9 +658,9 @@ export default class RestApi {
         }
       }
 
-      const { object, xapiObject } = req
-      const task = app.tasks.create({ name: `REST: ${action} ${req.collection.type}`, objectId: object.id })
-      const pResult = task.run(() => fn({ object, xapiObject }, params, req))
+      const { xapiObject, xoObject } = req
+      const task = app.tasks.create({ name: `REST: ${action} ${req.collection.type}`, objectId: xoObject.id })
+      const pResult = task.run(() => fn({ xapiObject, xoObject }, params, req))
       if (Object.hasOwn(req.query, 'sync')) {
         pResult.then(result => res.json(result), next)
       } else {

packages/xo-web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "xo-web",
-  "version": "5.136.1",
+  "version": "5.136.0",
   "license": "AGPL-3.0-or-later",
   "description": "Web interface client for Xen-Orchestra",
   "keywords": [

packages/xo-web/src/common/form/index.js

@@ -138,7 +138,7 @@ export class Range extends Component {
 
 export Toggle from './toggle'
 
-const UNITS = ['kiB', 'MiB', 'GiB', 'TiB', 'PiB']
+const UNITS = ['kiB', 'MiB', 'GiB']
 const DEFAULT_UNIT = 'GiB'
 
 export class SizeInput extends BaseComponent {

packages/xo-web/src/common/intl/messages.js

@@ -141,7 +141,6 @@ const messages = {
   removeColor: 'Remove color',
   xcpNg: 'XCP-ng',
   noFileSelected: 'No file selected',
-  nRetriesVmBackupFailures: 'Number of retries if VM backup fails',
 
   // ----- Modals -----
   alertOk: 'OK',
@@ -2047,6 +2046,7 @@ const messages = {
   vmsWithDuplicatedMacAddressesMessage:
     '{nVms, number} VM{nVms, plural, one {} other {s}} contain{nVms, plural, one {s} other {}} duplicate MAC addresses or {nVms, plural, one {has} other {have}} the same MAC addresses as other running VMs. Do you want to continue?',
   ignoreVdi: 'Ignore this VDI',
+  selectDestinationSr: 'Select a destination SR',
 
   // ----- Servers -----
   enableServerErrorTitle: 'Enable server',

packages/xo-web/src/common/report-bug-button.js

@@ -75,7 +75,7 @@ export const reportOnSupportPanel = async ({ files = [], formatMessage = identit
     ADDITIONAL_FILES.map(({ fetch, name }) =>
       timeout.call(fetch(), ADDITIONAL_FILES_FETCH_TIMEOUT).then(
         file => formData.append('attachments', createBlobFromString(file), name),
-        error => logger.warn(`cannot get ${name}`, { error })
+        error => logger.warn(`cannot get ${name}`, error)
       )
     )
   )

packages/xo-web/src/common/select-objects.js

@@ -1099,9 +1099,7 @@ export const SelectXoCloudConfig = makeSubscriptionSelect(
   subscriber =>
     subscribeCloudXoConfigBackups(configs => {
       const xoObjects = groupBy(
-        map(configs, config => ({ ...config, type: 'xoConfig' }))
-          // from newest to oldest
-          .sort((a, b) => b.createdAt - a.createdAt),
+        map(configs, config => ({ ...config, type: 'xoConfig' })),
         'xoaId'
       )
       subscriber({

packages/xo-web/src/common/sorted-table/index.js

@@ -752,11 +752,6 @@ class SortedTable extends Component {
     const { location, stateUrlParam } = this.props
     this.setState({ itemsPerPage })
     cookies.set(`${location.pathname}-${stateUrlParam}`, itemsPerPage)
-
-    // changing the number of items per page should send back to the first page
-    //
-    // see https://github.com/vatesfr/xen-orchestra/issues/7350
-    this._setPage(1)
   }
 
   render() {

packages/xo-web/src/common/xo/choose-sr-for-each-vdis-modal/index.js

@@ -59,6 +59,7 @@ export default class ChooseSrForEachVdisModal extends Component {
       ignorableVdis = false,
       mainSrPredicate = isSrWritable,
       placeholder,
+      required,
       srPredicate = mainSrPredicate,
       value: { mainSr, mapVdisSrs },
       vdis,
@@ -66,15 +67,21 @@ export default class ChooseSrForEachVdisModal extends Component {
 
     return (
       <div>
-        <SelectSr
-          onChange={this._onChangeMainSr}
-          placeholder={placeholder !== undefined ? placeholder : _('chooseSrForEachVdisModalMainSr')}
-          predicate={mainSrPredicate}
-          required
-          value={mainSr}
-        />
+        <SingleLineRow>
+          <Col size={6}>{_('selectDestinationSr')}</Col>
+          <Col size={6}>
+            <SelectSr
+              onChange={this._onChangeMainSr}
+              placeholder={placeholder !== undefined ? placeholder : _('chooseSrForEachVdisModalMainSr')}
+              predicate={mainSrPredicate}
+              required
+              value={mainSr}
+            />
+          </Col>
+        </SingleLineRow>
+        {!required && <i>{_('optionalEntry')}</i>}
         <br />
-        {!isEmpty(vdis) && mainSr != null && (
+        {!isEmpty(vdis) && (
           <Collapsible buttonText={_('chooseSrForEachVdisModalSelectSr')} collapsible size='small'>
             <br />
             <Container>

packages/xo-web/src/common/xo/index.js

@@ -1688,17 +1688,16 @@ export const migrateVm = async (vm, host) => {
     return
   }
 
-  const { migrationNetwork, sr, targetHost } = params
+  const { sr, srRequired, targetHost } = params
 
   if (!targetHost) {
     return error(_('migrateVmNoTargetHost'), _('migrateVmNoTargetHostMessage'))
   }
 
-  // Workaround to prevent VM's VDIs from unexpectedly migrating to the default SR
-  // if migration network is defined, the SR is required.
-  if (migrationNetwork !== undefined && sr === undefined) {
+  if (srRequired && sr === undefined) {
     return error(_('migrateVmNoSr'), _('migrateVmNoSrMessage'))
   }
+  delete params.srRequired
 
   try {
     await _call('vm.migrate', { vm: vm.id, ...params })
@@ -1733,6 +1732,11 @@ export const migrateVms = vms =>
       return error(_('migrateVmNoTargetHost'), _('migrateVmNoTargetHostMessage'))
     }
 
+    if (params.srRequired && params.sr === undefined) {
+      return error(_('migrateVmNoTargetHost'), _('migrateVmNoTargetHostMessage'))
+    }
+    delete params.srRequired
+
     const { mapVmsMapVdisSrs, mapVmsMapVifsNetworks, migrationNetwork, sr, targetHost, vms } = params
     Promise.all(
       map(vms, ({ id }) =>

packages/xo-web/src/common/xo/migrate-vm-modal/index.js

@@ -122,6 +122,7 @@ export default class MigrateVmModalBody extends BaseComponent {
       migrationNetwork: this.state.migrationNetworkId,
       sr: resolveId(this.state.targetSrs.mainSr),
       targetHost: this.state.host && this.state.host.id,
+      srRequired: !this.state.doNotMigrateVdis,
     }
   }
 
@@ -222,14 +223,14 @@ export default class MigrateVmModalBody extends BaseComponent {
             </Col>
           </SingleLineRow>
         </div>
-        {host && (!doNotMigrateVdis || migrationNetworkId != null) && (
+        {host && (
           <div className={styles.groupBlock}>
             <SingleLineRow>
               <Col size={12}>
                 <ChooseSrForEachVdisModal
                   mainSrPredicate={this._getSrPredicate()}
                   onChange={this.linkState('targetSrs')}
-                  required
+                  required={!doNotMigrateVdis}
                   value={targetSrs}
                   vdis={vdis}
                 />

packages/xo-web/src/common/xo/migrate-vms-modal/index.js

@@ -101,10 +101,6 @@ export default class MigrateVmsModalBody extends BaseComponent {
     )
   }
 
-  componentDidMount() {
-    this._selectHost(this.props.host)
-  }
-
   get value() {
     const { host } = this.state
     const vms = filter(this.props.vms, vm => vm.$container !== host.id)
@@ -112,7 +108,15 @@ export default class MigrateVmsModalBody extends BaseComponent {
       return { vms }
     }
     const { networks, pifs, vbdsByVm, vifsByVm } = this.props
-    const { doNotMigrateVdi, doNotMigrateVmVdis, migrationNetworkId, networkId, smartVifMapping, srId } = this.state
+    const {
+      doNotMigrateVdi,
+      doNotMigrateVmVdis,
+      migrationNetworkId,
+      noVdisMigration,
+      networkId,
+      smartVifMapping,
+      srId,
+    } = this.state
 
     // Map VM --> ( Map VDI --> SR )
     // 2021-02-16: Fill the map (VDI -> SR) with *all* the VDIs to avoid unexpectedly migrating them to the wrong SRs:
@@ -124,10 +128,14 @@ export default class MigrateVmsModalBody extends BaseComponent {
       forEach(vbds, vbd => {
         const vdi = vbd.VDI
         if (!vbd.is_cd_drive && vdi) {
-          mapVdisSrs[vdi] = doNotMigrateVmVdis[vm] || doNotMigrateVdi[vdi] ? this._getObject(vdi).$SR : srId
+          if (!doNotMigrateVmVdis[vm] && !doNotMigrateVdi[vdi]) {
+            mapVdisSrs[vdi] = srId
+          }
         }
       })
-      mapVmsMapVdisSrs[vm] = mapVdisSrs
+      if (!isEmpty(mapVdisSrs)) {
+        mapVmsMapVdisSrs[vm] = mapVdisSrs
+      }
     })
 
     const defaultNetwork =
@@ -160,6 +168,7 @@ export default class MigrateVmsModalBody extends BaseComponent {
       mapVmsMapVifsNetworks,
       migrationNetwork: migrationNetworkId,
       sr: srId,
+      srRequired: !noVdisMigration,
       targetHost: host.id,
       vms,
     }
@@ -212,7 +221,7 @@ export default class MigrateVmsModalBody extends BaseComponent {
       networkId: defaultMigrationNetworkId,
       noVdisMigration,
       smartVifMapping: true,
-      srId: defaultSrConnectedToHost ? defaultSrId : undefined,
+      srId: !noVdisMigration && defaultSrConnectedToHost ? defaultSrId : undefined,
     })
   }
 
@@ -254,27 +263,11 @@ export default class MigrateVmsModalBody extends BaseComponent {
             </Col>
           </SingleLineRow>
         </div>
-        {host !== undefined && (
-          <div style={LINE_STYLE}>
-            <SingleLineRow>
-              <Col size={6}>{_('migrateVmSelectMigrationNetwork')}</Col>
-              <Col size={6}>
-                <SelectNetwork
-                  onChange={this._selectMigrationNetwork}
-                  predicate={this._getMigrationNetworkPredicate()}
-                  required={!intraPool}
-                  value={migrationNetworkId}
-                />
-              </Col>
-            </SingleLineRow>
-            {intraPool && <i>{_('optionalEntry')}</i>}
-          </div>
-        )}
-        {host && (!noVdisMigration || migrationNetworkId != null) && (
+        {host !== undefined && [
           <div key='sr' style={LINE_STYLE}>
             <SingleLineRow>
               <Col size={6}>
-                {!intraPool ? _('migrateVmsSelectSr') : _('migrateVmsSelectSrIntraPool')}{' '}
+                {_('selectDestinationSr')}{' '}
                 {(defaultSrId === undefined || !defaultSrConnectedToHost) && (
                   <Tooltip
                     content={
@@ -292,11 +285,31 @@ export default class MigrateVmsModalBody extends BaseComponent {
                 )}
               </Col>
               <Col size={6}>
-                <SelectSr onChange={this._selectSr} predicate={this._getSrPredicate()} required value={srId} />
+                <SelectSr
+                  onChange={this._selectSr}
+                  predicate={this._getSrPredicate()}
+                  required={!noVdisMigration}
+                  value={srId}
+                />
               </Col>
             </SingleLineRow>
-          </div>
-        )}
+            {noVdisMigration && <i>{_('optionalEntry')}</i>}
+          </div>,
+          <div style={LINE_STYLE} key='network'>
+            <SingleLineRow>
+              <Col size={6}>{_('migrateVmSelectMigrationNetwork')}</Col>
+              <Col size={6}>
+                <SelectNetwork
+                  onChange={this._selectMigrationNetwork}
+                  predicate={this._getMigrationNetworkPredicate()}
+                  required={!intraPool}
+                  value={migrationNetworkId}
+                />
+              </Col>
+            </SingleLineRow>
+            {intraPool && <i>{_('optionalEntry')}</i>}
+          </div>,
+        ]}
         {host && !intraPool && (
           <div key='network' style={LINE_STYLE}>
             <SingleLineRow>

packages/xo-web/src/xo-app/backup/new/index.js

@@ -189,7 +189,6 @@ const getInitialState = ({ preSelectedVmIds, setHomeVmIdsSelection, suggestedExc
     drMode: false,
     name: '',
     nbdConcurrency: 1,
-    nRetriesVmBackupFailures: 0,
     preferNbd: false,
     remotes: [],
     schedules: {},
@@ -636,11 +635,6 @@ const New = decorate([
           nbdConcurrency,
         })
       },
-      setNRetriesVmBackupFailures({ setGlobalSettings }, nRetries) {
-        setGlobalSettings({
-          nRetriesVmBackupFailures: nRetries,
-        })
-      },
     },
     computed: {
       compressionId: generateId,
@@ -650,7 +644,6 @@ const New = decorate([
       inputMaxExportRate: generateId,
       inputPreferNbd: generateId,
       inputNbdConcurrency: generateId,
-      inputNRetriesVmBackupFailures: generateId,
       inputTimeoutId: generateId,
 
       // In order to keep the user preference, the offline backup is kept in the DB
@@ -763,7 +756,6 @@ const New = decorate([
       fullInterval,
       maxExportRate,
       nbdConcurrency = 1,
-      nRetriesVmBackupFailures = 0,
       offlineBackup,
       offlineSnapshot,
       preferNbd,
@@ -998,17 +990,6 @@ const New = decorate([
                           value={concurrency}
                         />
                       </FormGroup>
-                      <FormGroup>
-                        <label htmlFor={state.inputNRetriesVmBackupFailures}>
-                          <strong>{_('nRetriesVmBackupFailures')}</strong>
-                        </label>
-                        <Number
-                          id={state.inputNRetriesVmBackupFailures}
-                          min={0}
-                          onChange={effects.setNRetriesVmBackupFailures}
-                          value={nRetriesVmBackupFailures}
-                        />
-                      </FormGroup>
                       <FormGroup>
                         <label htmlFor={state.inputTimeoutId}>
                           <strong>{_('timeout')}</strong>

packages/xo-web/src/xo-app/backup/new/mirror/index.js

@@ -124,8 +124,6 @@ const NewMirrorBackup = decorate([
         setAdvancedSettings({ timeout: timeout !== undefined ? timeout * 3600e3 : undefined }),
       setMaxExportRate: ({ setAdvancedSettings }, rate) =>
         setAdvancedSettings({ maxExportRate: rate !== undefined ? rate * (1024 * 1024) : undefined }),
-      setNRetriesVmBackupFailures: ({ setAdvancedSettings }, nRetriesVmBackupFailures) =>
-        setAdvancedSettings({ nRetriesVmBackupFailures }),
       setSourceRemote: (_, obj) => () => ({
         sourceRemote: obj === null ? {} : obj.value,
       }),
@@ -206,7 +204,6 @@ const NewMirrorBackup = decorate([
       inputConcurrencyId: generateId,
       inputTimeoutId: generateId,
       inputMaxExportRateId: generateId,
-      inputNRetriesVmBackupFailures: generateId,
       isBackupInvalid: state =>
         state.isMissingName || state.isMissingBackupMode || state.isMissingSchedules || state.isMissingRetention,
       isFull: state => state.mode === 'full',
@@ -234,7 +231,7 @@ const NewMirrorBackup = decorate([
   }),
   injectState,
   ({ state, effects, intl: { formatMessage } }) => {
-    const { concurrency, timeout, maxExportRate, nRetriesVmBackupFailures = 0 } = state.advancedSettings
+    const { concurrency, timeout, maxExportRate } = state.advancedSettings
     return (
       <form id={state.formId}>
         <Container>
@@ -317,17 +314,6 @@ const NewMirrorBackup = decorate([
                           value={concurrency}
                         />
                       </FormGroup>
-                      <FormGroup>
-                        <label htmlFor={state.inputNRetriesVmBackupFailures}>
-                          <strong>{_('nRetriesVmBackupFailures')}</strong>
-                        </label>
-                        <Number
-                          id={state.inputNRetriesVmBackupFailures}
-                          min={0}
-                          onChange={effects.setNRetriesVmBackupFailures}
-                          value={nRetriesVmBackupFailures}
-                        />
-                      </FormGroup>
                       <FormGroup>
                         <label htmlFor={state.inputTimeoutId}>
                           <strong>{_('timeout')}</strong>

packages/xo-web/src/xo-app/backup/overview/tab-jobs.js

@@ -319,7 +319,6 @@ class JobsTable extends React.Component {
             compression,
             concurrency,
             fullInterval,
-            nRetriesVmBackupFailures,
             offlineBackup,
             offlineSnapshot,
             proxyId,
@@ -350,9 +349,6 @@ class JobsTable extends React.Component {
               {compression !== undefined && (
                 <Li>{_.keyValue(_('compression'), compression === 'native' ? 'GZIP' : compression)}</Li>
               )}
-              {nRetriesVmBackupFailures > 0 && (
-                <Li>{_.keyValue(_('nRetriesVmBackupFailures'), nRetriesVmBackupFailures)}</Li>
-              )}
             </Ul>
           )
         },

packages/xo-web/src/xo-app/home/index.js

@@ -555,11 +555,6 @@ export default class Home extends Component {
   _setNItemsPerPage(nItems) {
     this.setState({ homeItemsPerPage: nItems })
     cookies.set('homeItemsPerPage', nItems)
-
-    // changing the number of items per page should send back to the first page
-    //
-    // see https://github.com/vatesfr/xen-orchestra/issues/7350
-    this._onPageSelection(1)
   }
 
   _getPage() {

packages/xo-web/src/xo-app/settings/config/xo-cloud-config/index.js

@@ -5,9 +5,10 @@ import decorate from 'apply-decorators'
 import Icon from 'icon'
 import React from 'react'
 import { confirm } from 'modal'
+import { getApiApplianceInfo, subscribeCloudXoConfig, subscribeCloudXoConfigBackups } from 'xo'
+import { groupBy, sortBy } from 'lodash'
 import { injectState, provideState } from 'reaclette'
 import { SelectXoCloudConfig } from 'select-objects'
-import { subscribeCloudXoConfig, subscribeCloudXoConfigBackups } from 'xo'
 
 import BackupXoConfigModal from './backup-xo-config-modal'
 import RestoreXoConfigModal from './restore-xo-config-modal'
@@ -87,7 +88,15 @@ const CloudConfig = decorate([
         },
     },
     computed: {
+      applianceId: async () => {
+        const { id } = await getApiApplianceInfo()
+        return id
+      },
+      groupedConfigs: ({ applianceId, sortedConfigs }) =>
+        sortBy(groupBy(sortedConfigs, 'xoaId'), config => (config[0].xoaId === applianceId ? -1 : 1)),
       isConfigDefined: ({ config }) => config != null,
+      sortedConfigs: (_, { cloudXoConfigBackups }) =>
+        cloudXoConfigBackups?.sort((config, nextConfig) => config.createdAt - nextConfig.createdAt),
     },
   }),
   injectState,

packages/xo-web/src/xo-app/settings/remotes/index.js

@@ -33,7 +33,7 @@ const formatError = error => (typeof error === 'string' ? error : JSON.stringify
 
 const _changeUrlElement = (value, { remote, element }) =>
   editRemote(remote, {
-    url: format({ ...parse(remote.url), [element]: value === null ? undefined : value }),
+    url: format({ ...remote, [element]: value === null ? undefined : value }),
   })
 const _showError = remote => alert(_('remoteConnectionFailed'), <pre>{formatError(remote.error)}</pre>)
 const _editRemoteName = (name, { remote }) => editRemote(remote, { name })