public_git
/
democratic-csi
mirror of https://github.com/democratic-csi/democratic-csi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

attempt to gracefully handle fs expand failures during staging (#85) 

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen 2021-08-30 06:59:11 -06:00
parent 6c08679042
commit 339c53c93b
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/driver/index.js
View File

@ -571,7 +571,33 @@ class CsiBaseDriver {
case "ext3": case "ext3":
case "ext4dev": case "ext4dev":
//await filesystem.checkFilesystem(device, fs_info.type); //await filesystem.checkFilesystem(device, fs_info.type);
await filesystem.expandFilesystem(device, fs_type); try {
await filesystem.expandFilesystem(device, fs_type);
} catch (err) {
// mount is clean and rw, but it will not expand until clean umount has been done
// failed to execute filesystem command: resize2fs /dev/sda, response: {"code":1,"stdout":"Couldn't find valid filesystem superblock.\n","stderr":"resize2fs 1.44.5 (15-Dec-2018)\nresize2fs: Superblock checksum does not match superblock while trying to open /dev/sda\n"}
// /dev/sda on /var/lib/kubelet/plugins/kubernetes.io/csi/pv/pvc-4a80757e-5e87-475d-826f-44fcc4719348/globalmount type ext4 (rw,relatime,stripe=256)
if (
err.code == 1 &&
err.stdout.includes("find valid filesystem superblock") &&
err.stderr.includes("checksum does not match superblock")
) {
driver.ctx.logger.warn(
`successful mount, unsuccessful fs resize: attempting abnormal umount/mount/resize2fs to clear things up ${staging_target_path} (${device})`
);
// try an unmount/mount/fsck cycle again just to clean things up
await mount.umount(staging_target_path, []);
await mount.mount(
device,
staging_target_path,
["-t", fs_type].concat(["-o", mount_flags.join(",")])
);
await filesystem.expandFilesystem(device, fs_type);
} else {
throw err;
}
}
break; break;
case "xfs": case "xfs":
//await filesystem.checkFilesystem(device, fs_info.type); //await filesystem.checkFilesystem(device, fs_info.type);

7
src/utils/filesystem.js
View File

@ -426,12 +426,13 @@ class Filesystem {
// echo 1 > /sys/block/sdb/device/rescan // echo 1 > /sys/block/sdb/device/rescan
const sys_file = `/sys/block/${device_name}/device/rescan`; const sys_file = `/sys/block/${device_name}/device/rescan`;
console.log(`executing filesystem command: echo 1 > ${sys_file}`);
fs.writeFileSync(sys_file, "1"); fs.writeFileSync(sys_file, "1");
} }
} }
/** /**
* expand a give filesystem * expand a given filesystem
* *
* @param {*} device * @param {*} device
* @param {*} fstype * @param {*} fstype
@ -474,7 +475,7 @@ class Filesystem {
} }
/** /**
* expand a give filesystem * check a given filesystem
* *
* fsck [options] -- [fs-options] [<filesystem> ...] * fsck [options] -- [fs-options] [<filesystem> ...]
* *
@ -593,7 +594,7 @@ class Filesystem {
args.unshift(command); args.unshift(command);
command = filesystem.options.paths.sudo; command = filesystem.options.paths.sudo;
} }
console.log("executing fileystem command: %s %s", command, args.join(" ")); console.log("executing filesystem command: %s %s", command, args.join(" "));
const child = filesystem.options.executor.spawn(command, args, options); const child = filesystem.options.executor.spawn(command, args, options);
let didTimeout = false; let didTimeout = false;