BUGFIX:

- /node add_instance race condition with new foreign keys

Author: karel26

core/data/impl/nodeimpl.py

@@ -1429,17 +1429,11 @@ async def add_instance(self, name: str, *, template: str = "") -> "Instance":
         }
         with open(config_file, mode='w', encoding='utf-8') as outfile:
             yaml.dump(config, outfile)
-        settings_path = os.path.join(instance.home, 'Config', 'serverSettings.lua')
-        if os.path.exists(settings_path):
-            # TODO: dirty cast
-            settings = SettingsDict(cast(DataObject, cast(object, self)), settings_path, root='cfg')
-            settings['port'] = int(instance.dcs_port)
-            settings['name'] = 'n/a'
-            settings['missionList'] = []
-            settings['listStartIndex'] = 0
         bus = ServiceRegistry.get(ServiceBus)
         server = DataObjectFactory().new(ServerImpl, node=self.node, port=instance.bot_port, name='n/a', bus=bus)
         instance.server = server
+        # we cannot use instance.dcs_port here as that would refer to the assigned serverSettings.lua already
+        server.settings["port"] = int(instance.locals['dcs_port'])
         self.instances[instance.name] = instance
         bus.servers[server.name] = server
         if not self.master:

core/data/impl/serverimpl.py

@@ -113,11 +113,15 @@ def __post_init__(self):
         self._lock = asyncio.Lock()
         with self.pool.connection() as conn:
             with conn.transaction():
-                conn.execute("INSERT INTO servers (server_name) VALUES (%s) ON CONFLICT (server_name) DO NOTHING",
-                             (self.name, ))
-            row = conn.execute("SELECT maintenance FROM servers WHERE server_name = %s", (self.name,)).fetchone()
-            if row:
-                self._maintenance = row[0]
+                cursor = conn.execute("""
+                    INSERT INTO servers (server_name) 
+                    VALUES (%s) 
+                    ON CONFLICT (server_name) DO NOTHING
+                    RETURNING maintenance
+                """, (self.name, ))
+                row = cursor.fetchone()
+                if row:
+                    self._maintenance = row[0]
         atexit.register(self.stop_observer)
 
     @override
@@ -141,6 +145,7 @@ def settings(self) -> dict:
             # if someone managed to destroy the mission list, fix it...
             if 'missionList' not in self._settings:
                 self._settings['missionList'] = []
+                self._settings['listStartIndex'] = 0
             elif isinstance(self._settings['missionList'], dict):
                 self._settings['missionList'] = list(self._settings['missionList'].values())
         return self._settings
@@ -447,9 +452,11 @@ async def update_database(old_name: str, new_name: str):
             # rename the server in the database
             async with self.apool.connection() as conn:
                 async with conn.transaction():
-                    # we need to remove any older server that might have had the same name
                     await conn.execute("UPDATE servers SET server_name = %s WHERE server_name = %s",
-                                       (new_name, old_name))
+                                       (new_name, old_name or 'n/a'))
+                    if not old_name:
+                        await conn.execute("UPDATE instances SET server_name = %s WHERE instance = %s",
+                                           (new_name, self.instance.name))
 
         async def update_cluster(new_name: str):
             # only the master can take care of a cluster-wide rename
@@ -484,6 +491,13 @@ async def update_cluster(new_name: str):
         except Exception:
             self.log.exception(f"Error during renaming of server {old_name} to {new_name}: ", exc_info=True)
 
+    async def unlink(self):
+        if self.name == 'n/a':
+            async with self.apool.connection() as conn:
+                async with conn.transaction():
+                    await conn.execute("DELETE FROM servers WHERE server_name = 'n/a'")
+        self.instance.server = None
+
     @performance_log()
     def do_startup(self):
         basepath = self.node.installation

core/data/proxy/serverproxy.py

@@ -234,6 +234,15 @@ async def rename(self, new_name: str, update_settings: bool = False) -> None:
         }, node=self.node.name, timeout=timeout)
         self.name = new_name
 
+    @override
+    async def unlink(self):
+        await self.bus.send_to_node_sync({
+            "command": "rpc",
+            "object": "Server",
+            "method": "unlink",
+            "server_name": self.name
+        }, node=self.node.name, timeout=60)
+
     @override
     async def render_extensions(self) -> list[dict]:
         if not self._extensions:

core/data/server.py

@@ -293,6 +293,10 @@ async def send_to_dcs(self, message: dict):
     async def rename(self, new_name: str, update_settings: bool = False) -> None:
         raise NotImplementedError()
 
+    @abstractmethod
+    async def unlink(self):
+        raise NotImplementedError()
+
     @abstractmethod
     async def startup(self, modify_mission: bool | None = True, use_orig: bool | None = True) -> None:
         raise NotImplementedError()

locale/cn/LC_MESSAGES/admin.mo

@@ -362,7 +362,7 @@ msgstr "该实例正在被服务器使用 \"{}\".\n"
 msgid "Do you really want to delete instance {}?"
 msgstr "你真的想删除实例 {} 吗?"
 
-msgid "Do you want to remove the directory {}?"
+msgid "Do you want to remove the directory\n{}?"
 msgstr "你想删除目录 {} 吗?"
 
 msgid "Instance {instance} removed from node {node}."

locale/cn/LC_MESSAGES/admin.po

@@ -362,7 +362,7 @@ msgstr "Die Instanz wird zurzeit vom Server \"{}\" genutzt.\n"
 msgid "Do you really want to delete instance {}?"
 msgstr "Möchtest Du Instanz {} wirklich löschen?"
 
-msgid "Do you want to remove the directory {}?"
+msgid "Do you want to remove the directory\n{}?"
 msgstr "Möchtest Du das Verzeichnis {} auch löschen?"
 
 msgid "Instance {instance} removed from node {node}."

locale/de/LC_MESSAGES/admin.mo

@@ -356,8 +356,8 @@ msgstr "La instancia está en uso por el servidor \"{}\".\n"
 msgid "Do you really want to delete instance {}?"
 msgstr "¿Seguro que desea eliminar la instancia {}?"
 
-msgid "Do you want to remove the directory {}?"
-msgstr "Desea eliminar el directorio {}?"
+msgid "Do you want to remove the directory\n{}?"
+msgstr "Desea eliminar el directorio\n{}?"
 
 msgid "Instance {instance} removed from node {node}."
 msgstr "Instance {instance} eliminada del nodo {node}."