Merge pull request #479 from kubilus1/readseek

Lock multi-thread seek and read for same FH.
kubilus1 · Jan 16, 2024 · 1e81d5c · 1e81d5c
2 parents 7f5b3f2 + c36f9b9
commit 1e81d5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,9 +37,7 @@ jobs:
 
     - name: Setup 
       run: |
-          #choco --yes install winfsp
-          py -m pip install -U pytest 
-          py -m pip install -U -r requirements.txt
+          python -m pip install -U -r requirements.txt
 
     - name: Test
-      run: cd autoortho && py -m pytest -v test_getortho.py test_pydds.py test_downloader.py
+      run: cd autoortho && python -m pytest -v test_getortho.py test_pydds.py test_downloader.py
diff --git a/autoortho/autoortho_fuse.py b/autoortho/autoortho_fuse.py
@@ -70,6 +70,8 @@ class AutoOrtho(Operations):
     path_dict = {}
     tile_dict = {}
 
+    fh_locks = {}
+
     fh = 1000
 
     default_uid = -1
@@ -390,9 +392,10 @@ def read(self, path, length, offset, fh):
             return data
 
         if not data:
-            os.lseek(fh, offset, os.SEEK_SET)
-            data = os.read(fh, length)
-            log.debug(f"READ: Read {len(data)} bytes.")
+            with self.fh_locks.setdefault(fh, threading.Lock()):
+                os.lseek(fh, offset, os.SEEK_SET)
+                data = os.read(fh, length)
+                log.debug(f"READ: Read {len(data)} bytes.")
 
         return data