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

chore(xo-server/vhd/createReadStream): improve genericity (#2865)

Browse Source 
It should now be pretty easy to make it work to generate a delta VHD, which should be very useful when mergin multiple deltas together (during deletion.
This commit is contained in:
Julien Fontanet 2018-04-24 18:06:58 +02:00 committed by GitHub
parent e45f78ea20
commit 61a472f108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/xo-server/src/vhd-merge.js
View File

@ -878,12 +878,17 @@ export const createReadStream = asyncIteratorToStream(function * (handler, path)
// this the VHD we want to synthetize
const vhd = vhds[0]
// this is the root VHD
const rootVhd = vhds[nVhds - 1]
// data of our synthetic VHD
// TODO: empty parentUuid and parentLocatorEntry-s in header
// TODO: set parentLocatorEntry-s in header
let header = {
...vhd.header,
tableOffset: 512 + 1024,
parentUnicodeName: '',
parentTimestamp: rootVhd.header.parentTimestamp,
parentUnicodeName: rootVhd.header.parentUnicodeName,
parentUuid: rootVhd.header.parentUuid,
}
const bat = Buffer.allocUnsafe(
@ -891,7 +896,7 @@ export const createReadStream = asyncIteratorToStream(function * (handler, path)
)
let footer = {
...vhd.footer,
diskType: HARD_DISK_TYPE_DYNAMIC,
diskType: rootVhd.footer.diskType,
}
const sectorsPerBlockData = vhd.sectorsPerBlock
const sectorsPerBlock =
@ -940,7 +945,7 @@ export const createReadStream = asyncIteratorToStream(function * (handler, path)
const blocksByVhd = new Map()
const emitBlockSectors = function * (iVhd, i, n) {
const vhd = vhds[iVhd]
const isRootVhd = vhd.footer.diskType === HARD_DISK_TYPE_DYNAMIC
const isRootVhd = vhd === rootVhd
if (!vhd.containsBlock(iBlock)) {
if (isRootVhd) {
yield Buffer.alloc((n - i) * VHD_SECTOR_SIZE)