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

Revert "enable FUSE read_sync by default"

Browse Source 
This reverts commit 86b0921ac4.

Conflicts:
	src/s3fs.cpp
This commit is contained in:
Or Ozeri 2018-05-28 13:49:54 +03:00
parent 6555e7ebb0
commit d4e86a17d1
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/s3fs.cpp
View File

@ -120,7 +120,6 @@ static bool nocopyapi = false;
static bool norenameapi = false; static bool norenameapi = false;
static bool nonempty = false; static bool nonempty = false;
static bool allow_other = false; static bool allow_other = false;
static bool fuse_read_mode_set = false;
static bool load_iamrole = false; static bool load_iamrole = false;
static uid_t s3fs_uid = 0; static uid_t s3fs_uid = 0;
static gid_t s3fs_gid = 0; static gid_t s3fs_gid = 0;
@ -4323,10 +4322,6 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
allow_other = true; allow_other = true;
return 1; // continue for fuse option return 1; // continue for fuse option
} }
if(0 == strcmp(arg, "sync_read") || 0 == strcmp(arg, "async_read")){
fuse_read_mode_set = true;
return 1; // continue for fuse option
}
if(0 == STR2NCMP(arg, "mp_umask=")){ if(0 == STR2NCMP(arg, "mp_umask=")){
mp_umask = strtol(strchr(arg, '=') + sizeof(char), NULL, 0); mp_umask = strtol(strchr(arg, '=') + sizeof(char), NULL, 0);
mp_umask &= (S_IRWXU | S_IRWXG | S_IRWXO); mp_umask &= (S_IRWXU | S_IRWXG | S_IRWXO);
@ -4912,17 +4907,6 @@ int main(int argc, char* argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
// s3fs read is sync (fdent_lock is locked while reading)
// FUSE is async read by default
// switch FUSE to sync read to avoid hitting FUSE's max_background limit
// as well as to make sure that big read requests that are splitted by the kernel
// are always read in-order
if (!fuse_read_mode_set && 0 != fuse_opt_add_arg(&custom_args, "-osync_read")){
S3fsCurl::DestroyS3fsCurl();
s3fs_destroy_global_ssl();
exit(EXIT_FAILURE);
}
// [NOTE] // [NOTE]
// exclusive option check here. // exclusive option check here.
// //