octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-09-27 16:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

s3fs: print unmounting hint when the mount point is stale (#2295)

Browse Source 
When the error code returned by the stat information of the mount point
is ENOTCONN, print unmount command hint for user to fix.

Signed-off-by: Qinqi Qu <quqinqi@linux.alibaba.com>
This commit is contained in:
AdamQQQ 2023-09-03 09:50:09 +08:00 committed by GitHub
parent e8cb6d6d34
commit 68c45ce791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/s3fs.cpp
View File

@ -146,6 +146,8 @@ static bool set_mountpoint_attribute(struct stat& mpst);
static int set_bucket(const char* arg);
static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_args* outargs);
static fsblkcnt_t parse_bucket_size(char* value);
static bool is_cmd_exists(const std::string& command);
static int print_umount_message(const std::string& mp, bool force);
//-------------------------------------------------------------------
// fuse interface functions
@ -4635,6 +4637,35 @@ static fsblkcnt_t parse_bucket_size(char* max_size)
return n_bytes;
}
static bool is_cmd_exists(const std::string& command)
{
// The `command -v` is a POSIX-compliant method for checking the existence of a program.
std::string cmd = "command -v " + command + " >/dev/null 2>&1";
int result = system(cmd.c_str());
return (result !=-1 && WIFEXITED(result) && WEXITSTATUS(result) == 0);
}
static int print_umount_message(const std::string& mp, bool force)
{
std::string cmd;
if (is_cmd_exists("fusermount")){
if (force){
cmd = "fusermount -uz " + mp;
} else {
cmd = "fusermount -u " + mp;
}
}else{
if (force){
cmd = "umount -l " + mp;
} else {
cmd = "umount " + mp;
}
}
S3FS_PRN_EXIT("MOUNTPOINT %s is stale, you could use this command to fix: %s", mp.c_str(), cmd.c_str());
return 0;
}
// This is repeatedly called by the fuse option parser
// if the key is equal to FUSE_OPT_KEY_OPT, it's an option passed in prefixed by
@ -4670,7 +4701,12 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
set_mountpoint_attribute(stbuf);
#else
if(stat(arg, &stbuf) == -1){
// check stale mountpoint
if(errno == ENOTCONN){
print_umount_message(mountpoint, true);
} else {
S3FS_PRN_EXIT("unable to access MOUNTPOINT %s: %s", mountpoint.c_str(), strerror(errno));
}
return -1;
}
if(!(S_ISDIR(stbuf.st_mode))){