Merge #1654

1654: [sshfs_mount] Add no compression and cache_timeout options r=Saviq a=townsend2010

Fixes #1502

Co-authored-by: Chris Townsend <[email protected]>

Author: 2 people

src/sshfs_mount/sshfs_mount.cpp

@@ -87,7 +87,7 @@ auto get_sshfs_exec_and_options(mp::SSHSession& session)
 
     auto version_info{run_cmd(session, fmt::format("sudo {} -V", sshfs_exec))};
 
-    sshfs_exec += " -o slave -o transform_symlinks -o allow_other";
+    sshfs_exec += " -o slave -o transform_symlinks -o allow_other -o Compression=no";
 
     auto fuse_version_line = mp::utils::match_line_for(version_info, fuse_version_string);
     if (!fuse_version_line.empty())
@@ -107,7 +107,11 @@ auto get_sshfs_exec_and_options(mp::SSHSession& session)
         // The option was made the default in libfuse 3.0
         else if (version::Semver200_version(fuse_version) < version::Semver200_version("3.0.0"))
         {
-            sshfs_exec += " -o nonempty";
+            sshfs_exec += " -o nonempty -o cache_timeout=3";
+        }
+        else
+        {
+            sshfs_exec += " -o dcache_timeout=3";
         }
     }
     else

tests/test_sshfsmount.cpp

@@ -203,7 +203,8 @@ struct SshfsMount : public mp::test::SftpServerTest
          "/home/ubuntu/\n"},
         {"id -u", "1000\n"},
         {"id -g", "1000\n"},
-        {"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -o slave -o transform_symlinks -o allow_other :\"source\" "
+        {"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -o slave -o transform_symlinks -o allow_other -o "
+         "Compression=no -o dcache_timeout=3 :\"source\" "
          "\"target\"",
          "don't care\n"}};
 };
@@ -296,21 +297,22 @@ INSTANTIATE_TEST_SUITE_P(SshfsMountThrowWhenError, SshfsMountFail,
                          testing::Values("mkdir", "chown", "id -u", "id -g", "cd", "echo $PWD"));
 
 // Commands to check that a version of FUSE smaller that 3 gives a correct answer.
-CommandVector old_fuse_cmds = {{"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -V", "FUSE library version: 2.9.0\n"},
-                               {"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -o slave -o transform_symlinks -o "
-                                "allow_other -o nonempty :\"source\" \"/home/ubuntu/target\"",
-                                "don't care\n"}};
+CommandVector old_fuse_cmds = {
+    {"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -V", "FUSE library version: 2.9.0\n"},
+    {"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -o slave -o transform_symlinks -o "
+     "allow_other -o Compression=no -o nonempty -o cache_timeout=3 :\"source\" \"/home/ubuntu/target\"",
+     "don't care\n"}};
 
 // Commands to check that a version of FUSE at least 3.0.0 gives a correct answer.
 CommandVector new_fuse_cmds = {{"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -V", "FUSE library version: 3.0.0\n"},
                                {"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -o slave -o transform_symlinks -o "
-                                "allow_other :\"source\" \"/home/ubuntu/target\"",
+                                "allow_other -o Compression=no -o dcache_timeout=3 :\"source\" \"/home/ubuntu/target\"",
                                 "don't care\n"}};
 
 // Commands to check that an unknown version of FUSE gives a correct answer.
 CommandVector unk_fuse_cmds = {{"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -V", "weird fuse version\n"},
                                {"sudo env LD_LIBRARY_PATH=/foo/bar /baz/bin/sshfs -o slave -o transform_symlinks -o "
-                                "allow_other :\"source\" \"/home/ubuntu/target\"",
+                                "allow_other -o Compression=no :\"source\" \"/home/ubuntu/target\"",
                                 "don't care\n"}};
 
 // Commands to check that the server correctly creates the mount target.