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

more aggressive logic for force unmounts on stale mounts 

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen 2021-06-26 09:25:11 -06:00
parent a13b30ab3d
commit c761b426d4
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/driver/index.js
View File

@ -597,7 +597,8 @@ class CsiBaseDriver {
const staging_target_path = call.request.staging_target_path; const staging_target_path = call.request.staging_target_path;
const block_path = staging_target_path + "/block_device"; const block_path = staging_target_path + "/block_device";
let normalized_staging_path = staging_target_path; let normalized_staging_path = staging_target_path;
const umount_args = []; // --force const umount_args = [];
const umount_force_extra_args = ["--force", "--lazy"];
if (!staging_target_path) { if (!staging_target_path) {
throw new GrpcError( throw new GrpcError(
@ -618,7 +619,14 @@ class CsiBaseDriver {
* AND the fs is probably stalled * AND the fs is probably stalled
*/ */
if (err.timeout) { if (err.timeout) {
result = false; driver.ctx.logger.warn(
`detected stale mount, attempting to force unmount: ${normalized_staging_path}`
);
await mount.umount(
normalized_staging_path,
umount_args.concat(umount_force_extra_args)
);
result = false; // assume we are *NOT* a block device at this point
} else { } else {
throw err; throw err;
} }
@ -653,12 +661,13 @@ class CsiBaseDriver {
result = await mount.getMountDetails(normalized_staging_path); result = await mount.getMountDetails(normalized_staging_path);
switch (result.fstype) { switch (result.fstype) {
case "nfs": case "nfs":
case "nfs4":
driver.ctx.logger.warn( driver.ctx.logger.warn(
`detected stale nfs filesystem, attempting to force unmount: ${normalized_staging_path}` `detected stale nfs filesystem, attempting to force unmount: ${normalized_staging_path}`
); );
result = await mount.umount( result = await mount.umount(
normalized_staging_path, normalized_staging_path,
umount_args.concat(["--force", "--lazy"]) umount_args.concat(umount_force_extra_args)
); );
break; break;
default: default:
@ -913,9 +922,29 @@ class CsiBaseDriver {
const volume_id = call.request.volume_id; const volume_id = call.request.volume_id;
const target_path = call.request.target_path; const target_path = call.request.target_path;
const umount_args = []; // --force const umount_args = [];
const umount_force_extra_args = ["--force", "--lazy"];
try {
result = await mount.pathIsMounted(target_path);
} catch (err) {
// running findmnt on non-existant paths return immediately
// the only time this should timeout is on a stale fs
// so if timeout is hit we should be near certain it is indeed mounted
if (err.timeout) {
driver.ctx.logger.warn(
`detected stale mount, attempting to force unmount: ${target_path}`
);
await mount.umount(
target_path,
umount_args.concat(umount_force_extra_args)
);
result = false; // assume we have fully unmounted
} else {
throw err;
}
}
result = await mount.pathIsMounted(target_path);
if (result) { if (result) {
try { try {
result = await mount.umount(target_path, umount_args); result = await mount.umount(target_path, umount_args);
@ -928,12 +957,13 @@ class CsiBaseDriver {
result = await mount.getMountDetails(target_path); result = await mount.getMountDetails(target_path);
switch (result.fstype) { switch (result.fstype) {
case "nfs": case "nfs":
case "nfs4":
driver.ctx.logger.warn( driver.ctx.logger.warn(
`detected stale nfs filesystem, attempting to force unmount: ${target_path}` `detected stale nfs filesystem, attempting to force unmount: ${target_path}`
); );
result = await mount.umount( result = await mount.umount(
target_path, target_path,
umount_args.concat(["--force", "--lazy"]) umount_args.concat(umount_force_extra_args)
); );
break; break;
default: default: