Simplified FS code

Author: dmfrodrigues

s4mount.py

@@ -26,33 +26,15 @@
 import sys
 
 from argparse import ArgumentParser
-import logging
 import singlestoredb as s2
 
-
 try:
     import faulthandler
 except ImportError:
     pass
 else:
     faulthandler.enable()
 
-log = logging.getLogger(__name__)
-
-# def init_logging(debug=False):
-#     formatter = logging.Formatter('%(asctime)s.%(msecs)03d %(threadName)s: '
-#                                   '[%(name)s] %(message)s', datefmt="%Y-%m-%d %H:%M:%S")
-#     handler = logging.StreamHandler()
-#     handler.setFormatter(formatter)
-#     root_logger = logging.getLogger()
-#     if debug:
-#         handler.setLevel(logging.DEBUG)
-#         root_logger.setLevel(logging.DEBUG)
-#     else:
-#         handler.setLevel(logging.INFO)
-#         root_logger.setLevel(logging.INFO)
-#     root_logger.addHandler(handler)
-
 def daemonize() -> None:
     devnull = os.open(os.devnull, os.O_RDWR)
     os.dup2(devnull, sys.stdin.fileno())
@@ -68,12 +50,6 @@ def parse_args():
                         help='Where to mount the file system')
     return parser.parse_args()
 
-def mountStage(access_token, base_url, workspaceGroupID, mountpoint):
-    os.makedirs(f"{mountpoint}/stage/{workspaceGroupID}", exist_ok=True)
-    workspaceManager = s2.manage_workspaces(access_token, base_url=base_url)
-    wg = workspaceManager.get_workspace_group(workspaceGroupID)
-    wg.stage.mount(f"{mountpoint}/stage/{workspaceGroupID}")
-
 def main():
     options = parse_args()
 

singlestoredb/management/files.py

@@ -390,7 +390,8 @@ def isDir(self):
     def isFile(self):
         return not self.isDir()
 
-    def children(self):
+    @property
+    def children(self) -> List[int]:
         if self._children is None:
             self._children = []
             childrenNames = self.fs.stage.listdir(self.getStagePath())
@@ -400,6 +401,10 @@ def children(self):
                 self._children.append(childInode.id)
 
         return self._children
+    
+    def unlink(self, id):
+        assert self._children is not None
+        self._children.remove(id)
 
 class SinglestoreFS(pyfuse3.Operations):
     def __init__(self, fileLocation: FileLocation):
@@ -453,7 +458,7 @@ async def lookup(self, parent_id, name, ctx=None):
 
         assert parent_inode.isDir()
 
-        for child_id in parent_inode.children():
+        for child_id in parent_inode.children:
             child_inode = self.inodes[child_id]
             if child_inode.getNameWithoutTrailingSlash() == name.decode():
                 return await self.getattr(child_id)
@@ -472,7 +477,7 @@ async def readdir(self, fh, start_id, token):
 
         assert inode.isDir()
 
-        children = {child: self.inodes[child] for child in inode.children() if child > start_id}
+        children = {child: self.inodes[child] for child in inode.children if child > start_id}
 
         for child in children.values():
             pyfuse3.readdir_reply(
@@ -519,7 +524,7 @@ async def unlink(self, parent_id, name, ctx):
         inode = self.inodes[attr.st_ino]
         assert inode.isFile()
         self.stage.remove(inode.getStagePath())
-        parent_inode._children.remove(inode.id)
+        parent_inode.unlink(inode.id)
         del self.inodes[inode.id]
         return
 
@@ -544,7 +549,7 @@ async def rename(self, parent_id, name, newparent_id, newname, ctx):
         inode.parent = newparent_inode
         inode.name = newname.decode()
         newparent_inode._children.append(inode.id)
-        parent_inode._children.remove(inode.id)
+        parent_inode.unlink(inode.id)
         return
 
     async def rmdir(self, parent_id, name, ctx):
@@ -554,7 +559,7 @@ async def rmdir(self, parent_id, name, ctx):
         inode = self.inodes[attr.st_ino]
         assert inode.isDir()
         self.stage.rmdir(inode.getStagePath())
-        parent_inode._children.remove(inode.id)
+        parent_inode.unlink(inode.id)
         del self.inodes[inode.id]
         return
 
@@ -686,7 +691,7 @@ def mount(self, mountpoint) -> None:
         fs = SinglestoreFS(self)
         fuse_options = set(pyfuse3.default_options)
         # fuse_options.add('fsname=singlestore_fs')
-        # fuse_options.add('debug')
+        fuse_options.add('debug')
         pyfuse3.init(fs, mountpoint, fuse_options)
 
         try:

stagemount.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+'''
+hello.py - Example file system for pyfuse3.
+
+This program presents a static file system containing a single file.
+
+Copyright © 2015 Nikolaus Rath <Nikolaus.org>
+Copyright © 2015 Gerion Entrup.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+'''
+
+import os
+import sys
+
+from argparse import ArgumentParser
+import singlestoredb as s2
+
+try:
+    import faulthandler
+except ImportError:
+    pass
+else:
+    faulthandler.enable()
+
+def parse_args():
+    '''Parse command line'''
+
+    parser = ArgumentParser()
+
+    parser.add_argument('mountpoint', type=str,
+                        help='Where to mount the file system')
+    return parser.parse_args()
+
+def main():
+    options = parse_args()
+
+    access_token = os.getenv("API_KEY")
+    base_url = os.getenv("API_BASEURL")
+    workspaceGroupID = os.getenv("WORKSPACEGROUP_ID")
+    if not access_token:
+        print("API_KEY not set")
+        sys.exit(1)
+    if not base_url:
+        print("API_BASEURL not set")
+        sys.exit(1)
+    if not workspaceGroupID:
+        print("WORKSPACEGROUP_ID not set")
+        sys.exit(1)
+
+    # Mount stage for each workspace group
+    wg = s2.manage_workspaces(access_token, base_url=base_url).get_workspace_group(workspaceGroupID)
+    wg.stage.mount(options.mountpoint)
+
+if __name__ == '__main__':
+    main()