jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

More robust root disk detection

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-10-17 16:26:39 +02:00
parent 84c016490c
commit a55adf12db
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/metrics.js
View File

@@ -104,18 +104,29 @@ async function getRootDiskName() {
if (gRootDiskName) return gRootDiskName;
const mounts = await fs.promises.readFile('/proc/mounts', { encoding: 'utf8' });
const rootfsLine = mounts.split('\n').find(line => line.split(' ')[1] === '/');
const rootfsLine = mounts.split('\n').find(line => line.split(/\s+/)[1] === '/');
if (!rootfsLine) throw new BoxError(BoxError.EXTERNAL_ERROR, 'Root mount not found');
const devicePath = rootfsLine.split(' ')[0]; // eg. /dev/foo . This can be a partition or a disk path
const maybeDevicePath = rootfsLine.split(/\s+/)[0]; // eg. /dev/foo . This can be a partition or a disk path
// -n is no headings , -d is no holder devices or slaves , -o is output format . PKNAME is parent kernel name
const output = await shell.spawn('lsblk', [ '-ndo', 'PKNAME', devicePath ], { encoding: 'utf8' });
gRootDiskName = output.trim() || devicePath.replace('/dev/', '');
// for LVM, the canonical devicePath might be a symlink to the real disk
const devicePath = await fs.promises.realpath(maybeDevicePath);
// keep going up to find the final parent disk
let pkname = devicePath.replace('/dev/', '');
while (true) {
// -n is no headings , -d is no holder devices or slaves , -o is output format . PKNAME is parent kernel name
const output = await shell.spawn('lsblk', [ '-ndo', 'PKNAME', `/dev/${pkname}` ], { encoding: 'utf8' });
if (!output.trim()) break;
pkname = output.trim();
}
gRootDiskName = pkname;
return gRootDiskName;
}
async function readDiskMetrics() {
const rootDiskName = await getRootDiskName();
const [rootDiskError, rootDiskName] = await safe(getRootDiskName());
if (rootDiskError) throw new BoxError(BoxError.EXTERNAL_ERROR, `Could not detect root disk: ${rootDiskError.message}`);
const diskstats = await fs.promises.readFile('/proc/diskstats', { encoding: 'utf8' });
const statsLine = diskstats.split('\n').find(l => l.includes(` ${rootDiskName} `));
if (!statsLine) throw new BoxError(BoxError.EXTERNAL_ERROR, `Could not get disk stats of ${rootDiskName}`);