-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FUSEX: Avoid deleting RocksKV during static destruction
rocksdb doesn't seem to like this: facebook/rocksdb#649
- Loading branch information
Showing
1 changed file
with
6 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -183,7 +183,7 @@ EosFuse::run(int argc, char* argv[], void *userdata) | |
// e.g. root> eosxd -ofsname=eos.cern.ch:/eos/ $HOME/eos mounts the /eos/ directory from eos.cern.ch shared under $HOME/eos/ | ||
// e.g. user> eosxd [email protected]:/eos/user/u/user/ $home/eos mounts /eos/user/u/user from eos.cern.ch private under $HOME/eos/ | ||
// If this is a user-private mount the syntax '[email protected]' should be used to distinguish private mounts of individual users in the 'df' output | ||
// | ||
// | ||
// Please note, that root mounts are by default shared mounts with kerberos configuration, | ||
// user mounts are private mounts with kerberos configuration | ||
// -------------------------------------------------------------------------------------------- | ||
|
@@ -210,7 +210,7 @@ EosFuse::run(int argc, char* argv[], void *userdata) | |
} | ||
else | ||
{ | ||
fprintf(stderr, "# no config file - running on default values\n"); | ||
fprintf(stderr, "# no config file - running on default values\n"); | ||
} | ||
|
||
if (!root.isMember("hostport")) | ||
|
@@ -263,7 +263,7 @@ EosFuse::run(int argc, char* argv[], void *userdata) | |
root["hostport"] = fsname; | ||
fprintf(stderr,"# extracted connection host from fsname is '%s'\n", fsname.c_str()); | ||
} | ||
|
||
// apply some default settings for undefined entries. | ||
{ | ||
if (!root.isMember("name")) | ||
|
@@ -547,7 +547,7 @@ EosFuse::run(int argc, char* argv[], void *userdata) | |
cconfig.journal = root["cache"]["journal"].asString(); | ||
|
||
// set defaults for journal and file-start cache | ||
if (geteuid()) | ||
if (geteuid()) | ||
{ | ||
if (!cconfig.location.length()) | ||
{ | ||
|
@@ -609,7 +609,7 @@ EosFuse::run(int argc, char* argv[], void *userdata) | |
|
||
// apply some defaults for all existing options | ||
|
||
|
||
|
||
// by default create all the specified cache paths | ||
std::string mk_cachedir = "mkdir -p " + config.mdcachedir; | ||
|
@@ -982,6 +982,7 @@ EosFuse::run(int argc, char* argv[], void *userdata) | |
tCapFlush.join(); | ||
|
||
fuse_unmount(local_mount_dir, fusechan); | ||
mKV.reset(); | ||
} | ||
else | ||
{ | ||
|