Skip to content

Commit

Permalink
FUSEX: Avoid deleting RocksKV during static destruction
Browse files Browse the repository at this point in the history
rocksdb doesn't seem to like this:
facebook/rocksdb#649
  • Loading branch information
gbitzes committed Nov 14, 2017
1 parent 6b148ff commit deba7b8
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions fusex/eosfuse.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 -ofsname=user@eos.cern.ch:/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 'foo@cern.ch' 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
// --------------------------------------------------------------------------------------------
Expand All @@ -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"))
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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())
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -982,6 +982,7 @@ EosFuse::run(int argc, char* argv[], void *userdata)
tCapFlush.join();

fuse_unmount(local_mount_dir, fusechan);
mKV.reset();
}
else
{
Expand Down

0 comments on commit deba7b8

Please sign in to comment.