X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/96f5b2d78c60d1a16f51a269270d180b3f9a60a3..4925686f6aa7214568ebd60be3acaa49dbf9dd1a:/services/fuse/bin/arv-mount

diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount
index e92b1b4832..b540efe82c 100755
--- a/services/fuse/bin/arv-mount
+++ b/services/fuse/bin/arv-mount
@@ -11,6 +11,7 @@ import time
 
 import arvados.commands._util as arv_cmd
 from arvados_fuse import *
+from arvados.safeapi import ThreadSafeApiCache
 
 logger = logging.getLogger('arvados.arv-mount')
 
@@ -43,6 +44,7 @@ with "--".
     parser.add_argument('--debug', action='store_true', help="""Debug mode""")
     parser.add_argument('--logfile', help="""Write debug logs and errors to the specified file (default stderr).""")
     parser.add_argument('--foreground', action='store_true', help="""Run in foreground (default is to daemonize unless --exec specified)""", default=False)
+    parser.add_argument('--encoding', type=str, help="Character encoding to use for filesystem, default is utf-8 (see Python codec registry for list of available encodings)", default="utf-8")
     parser.add_argument('--exec', type=str, nargs=argparse.REMAINDER,
                         dest="exec_args", metavar=('command', 'args', '...', '--'),
                         help="""Mount, run a command, then unmount and exit""")
@@ -79,8 +81,8 @@ with "--".
 
     try:
         # Create the request handler
-        operations = Operations(os.getuid(), os.getgid())
-        api = SafeApi(arvados.config)
+        operations = Operations(os.getuid(), os.getgid(), args.encoding)
+        api = ThreadSafeApiCache(arvados.config.settings())
 
         usr = api.users().current().execute(num_retries=args.retries)
         now = time.time()
@@ -97,6 +99,7 @@ with "--".
         elif args.home:
             dir_class = ProjectDirectory
             dir_args.append(usr)
+            dir_args.append(True)
         elif args.collection is not None:
             # Set up the request handler with the collection at the root
             dir_class = CollectionDirectory
@@ -116,6 +119,7 @@ with "--".
             e._entries['by_tag'] = operations.inodes.add_entry(TagsDirectory(*dir_args))
 
             dir_args.append(usr)
+            dir_args.append(True)
             e._entries['home'] = operations.inodes.add_entry(ProjectDirectory(*dir_args))
             e._entries['shared'] = operations.inodes.add_entry(SharedDirectory(*dir_args))