compose: restart simln container immediately when config is ready

Author: pinheadmz

src/backends/compose/compose_backend.py

@@ -266,7 +266,7 @@ def _write_docker_compose(self, warnet):
         # Initialize services and add them to the compose
         for service_name in warnet.services:
             if "compose" in services[service_name]["backends"]:
-                compose["services"][service_name] = self.service_from_json(services[service_name])
+                compose["services"][service_name] = self.service_from_json(service_name)
 
         docker_compose_path = warnet.config_dir / "docker-compose.yml"
         try:
@@ -451,7 +451,11 @@ def wait_for_healthy_tanks(self, warnet, timeout=60) -> bool:
 
         return healthy
 
-    def service_from_json(self, obj) -> object:
+    def get_service_container_name(self, service_name: str):
+        return f"{self.network_name}_{services[service_name]['container_name_suffix']}"
+
+    def service_from_json(self, service_name: str) -> object:
+        obj = services[service_name]
         volumes = obj.get("volumes", [])
         volumes += [f"{self.config_dir}" + filepath for filepath in obj.get("config_files", [])]
 
@@ -460,7 +464,7 @@ def service_from_json(self, obj) -> object:
             ports = [f"{obj['warnet_port']}:{obj['container_port']}"]
         return {
             "image": obj["image"],
-            "container_name": f"{self.network_name}_{obj['container_name_suffix']}",
+            "container_name": self.get_service_container_name(service_name),
             "ports": ports,
             "volumes": volumes,
             "privileged": obj.get("privileged", False),
@@ -470,3 +474,7 @@ def service_from_json(self, obj) -> object:
             "restart": "on-failure",
             "networks": [self.network_name]
         }
+
+    def restart_service_container(self, service_name: str):
+        container = self.client.containers.get(self.get_service_container_name(service_name))
+        container.restart()

src/warnet/server.py

@@ -302,6 +302,9 @@ def network_export(self, network: str, activity: str) -> bool:
             # Extract the archive into a subdirectory that is already
             # shared with the simln container as a volume
             subprocess.run(["tar", "-xf", wn.config_dir / 'simln.tar', "-C", wn.config_dir / 'simln'])
+            # Force quick restart of the container instead of waiting
+            # for the exponential backoff to come around
+            wn.container_interface.restart_service_container("simln")
         if self.backend == "k8s":
             # Write the archive to the "emptydir" volume in the simln pod
             wn.container_interface.write_service_config("simln", tar_buffer, "/simln/")