Fix: git-storage-backend could try to commit several commits at once

TrueBrain · TrueBrain · commit 5ce84c006ecb · 2022-08-01T15:33:01.000+02:00
There was an attempt to prevent that, but sadly, an Event was
used instead of a Lock. This meant that when the first commit
returned, all other pending were going through after that, instead
of one by one.

Lock is fair, as in, the first to acquire is the first to be released.
diff --git a/truewiki/storage/git.py b/truewiki/storage/git.py
@@ -15,8 +15,7 @@
 GIT_USERNAME = None
 GIT_EMAIL = None
 
-GIT_BUSY = asyncio.Event()
-GIT_BUSY.set()
+GIT_BUSY = asyncio.Lock()
 
 
 class OutOfProcessStorage:
@@ -108,8 +107,7 @@ def _init_repository(self):
         return _git
 
     async def _run_out_of_process_async(self, folder, ssh_command, callback, func, *args):
-        await GIT_BUSY.wait()
-        GIT_BUSY.clear()
+        await GIT_BUSY.acquire()
 
         try:
             out_of_process = self.out_of_process_class((GIT_USERNAME, GIT_EMAIL), folder, ssh_command)
@@ -125,7 +123,7 @@ async def _run_out_of_process_async(self, folder, ssh_command, callback, func, *
                 task = loop.run_in_executor(executor, getattr(out_of_process, func), *args)
                 result = await task
         finally:
-            GIT_BUSY.set()
+            GIT_BUSY.release()
 
         # Task indicated something went wrong; initiate a full reload.
         if result is False:
diff --git a/truewiki/storage/github.py b/truewiki/storage/github.py
@@ -112,6 +112,7 @@ def _reload_done(self):
         super().reload()
 
     def commit_done(self):
+        super().commit_done()
         self._run_out_of_process(None, "push")
 
     def get_history_url(self, page):
diff --git a/truewiki/storage/gitlab.py b/truewiki/storage/gitlab.py
@@ -55,6 +55,7 @@ def _reload_done(self):
         super().reload()
 
     def commit_done(self):
+        super().commit_done()
         self._run_out_of_process(None, "push")
 
     def get_history_url(self, page):
