refactor(worker): Drop gevent from asgi worker

OpenNeuroOrg · Aug 5, 2024 · ac475e1 · ac475e1
1 parent 067b774
commit ac475e1
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 194 deletions.
diff --git a/services/datalad/Pipfile b/services/datalad/Pipfile
@@ -20,7 +20,6 @@ requests = "*"
 GitPython = "*"
 PyJWT = ">=2"
 gunicorn = "*"
-gevent = "*"
 elastic-apm = "*"
 falcon-elastic-apm = "*"
 boto3 = "*"

diff --git a/services/datalad/Pipfile.lock b/services/datalad/Pipfile.lock
diff --git a/services/datalad/datalad_service/handlers/publish.py b/services/datalad/datalad_service/handlers/publish.py
@@ -1,5 +1,6 @@
+import asyncio
+
 import falcon
-import gevent
 
 from datalad_service.tasks.publish import create_remotes_and_export
 
@@ -13,7 +14,7 @@ def __init__(self, store):
 
     async def on_post(self, req, resp, dataset):
         dataset_path = self.store.get_dataset_path(dataset)
-        gevent.spawn(create_remotes_and_export,
-                     dataset_path, cookies=req.cookies)
+        asyncio.get_event_loop().run_in_executor(None, create_remotes_and_export,
+                                                 dataset_path, cookies=req.cookies)
         resp.media = {}
         resp.status = falcon.HTTP_OK
diff --git a/services/datalad/datalad_service/handlers/reexporter.py b/services/datalad/datalad_service/handlers/reexporter.py
@@ -1,6 +1,7 @@
+import asyncio
+
 import falcon
 import logging
-import gevent
 
 from datalad_service.tasks.publish import export_dataset
 
@@ -12,5 +13,6 @@ def __init__(self, store):
 
     async def on_post(self, req, resp, dataset):
         dataset_path = self.store.get_dataset_path(dataset)
-        gevent.spawn(export_dataset, dataset_path, req.cookies)
+        asyncio.get_event_loop().run_in_executor(None, export_dataset,
+                                                 dataset_path, cookies=req.cookies)
         resp.status = falcon.HTTP_OK
diff --git a/services/datalad/datalad_service/handlers/remote_import.py b/services/datalad/datalad_service/handlers/remote_import.py
@@ -1,6 +1,8 @@
-import falcon
+
+import asyncio
 import logging
-import gevent
+
+import falcon
 
 from datalad_service.tasks.remote_import import remote_import
 from datalad_service.common.user import get_user_info
@@ -16,6 +18,6 @@ async def on_post(self, req, resp, dataset, import_id):
         dataset_path = self.store.get_dataset_path(dataset)
         upload_path = self.store.get_upload_path(dataset, import_id)
         url = (await req.get_media())['url']
-        gevent.spawn(remote_import, dataset_path,
-                     upload_path, import_id, url, name, email, req.cookies)
+        asyncio.get_event_loop().run_in_executor(None, remote_import, dataset_path,
+            upload_path, import_id, url, name, email, req.cookies)
         resp.status = falcon.HTTP_OK
diff --git a/services/datalad/datalad_service/handlers/snapshots.py b/services/datalad/datalad_service/handlers/snapshots.py
@@ -1,7 +1,7 @@
+import asyncio
 import os
 import logging
 
-import gevent
 import falcon
 
 from datalad_service.tasks.snapshots import SnapshotDescriptionException, create_snapshot, get_snapshot, get_snapshots, SnapshotExistsException
@@ -60,7 +60,8 @@ async def on_post(self, req, resp, dataset, snapshot):
             if not skip_publishing:
                 monitor_remote_configs(ds_path)
                 # Publish after response
-                gevent.spawn(export_dataset, ds_path, req.cookies)
+                asyncio.get_event_loop().run_in_executor(None, export_dataset,
+                                                         ds_path, req.cookies)
         except SnapshotExistsException as err:
             resp.media = {'error': repr(err)}
             resp.status = falcon.HTTP_CONFLICT