add basic config lock between autoconf and scheduler + remove reverse…

…-proxy tests for linux
keyman9848 · Aug 31, 2023 · c206daf · c206daf
1 parent cf55ade
commit c206daf
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 49 deletions.
diff --git a/examples/reverse-proxy-multisite/setup-linux.sh b/examples/reverse-proxy-multisite/setup-linux.sh
diff --git a/examples/reverse-proxy-multisite/tests.json b/examples/reverse-proxy-multisite/tests.json
@@ -1,6 +1,6 @@
 {
   "name": "reverse-proxy-multisite",
-  "kinds": ["docker", "autoconf", "swarm", "kubernetes", "linux"],
+  "kinds": ["docker", "autoconf", "swarm", "kubernetes"],
   "timeout": 60,
   "delay": 90,
   "tests": [

diff --git a/examples/reverse-proxy-multisite/variables.env b/examples/reverse-proxy-multisite/variables.env
diff --git a/examples/reverse-proxy-singlesite/setup-linux.sh b/examples/reverse-proxy-singlesite/setup-linux.sh
diff --git a/examples/reverse-proxy-singlesite/tests.json b/examples/reverse-proxy-singlesite/tests.json
@@ -1,6 +1,6 @@
 {
   "name": "reverse-proxy-singlesite",
-  "kinds": ["docker", "autoconf", "swarm", "linux"],
+  "kinds": ["docker", "autoconf", "swarm"],
   "delay": 120,
   "timeout": 60,
   "no_copy_container": true,

diff --git a/examples/reverse-proxy-singlesite/variables.env b/examples/reverse-proxy-singlesite/variables.env
diff --git a/src/autoconf/Config.py b/src/autoconf/Config.py
@@ -113,6 +113,20 @@ def apply(self, instances, services, configs={}, first=False) -> bool:
             )
             sleep(5)
 
+        # wait until changes are applied
+        while True:
+            changes = self._db.check_changes()
+            if isinstance(changes, str):
+                self.__logger.error(
+                    f"An error occurred when checking for changes in the database : {changes}"
+                )
+            elif not any(changes.values()):
+                break
+            else:
+                self.__logger.warning(
+                    "Scheduler is already applying a configuration, retrying in 5 seconds ...",
+                )
+            sleep(5)
         # update instances in database
         if updates["instances"]:
             err = self._db.update_instances(self.__instances, changed=False)