BUGFIX:

- Fresh installation caused 2 database errors due to missing tables.

Author: karel26

core/data/impl/nodeimpl.py

@@ -898,6 +898,9 @@ async def check_nodes():
         except FatalException as ex:
             self.log.critical(ex)
             exit(SHUTDOWN)
+        except InFailedSqlTransaction:
+            # we should only be here when the CLUSTER table does not exist yet
+            raise
         except Exception as ex:
             self.log.exception(ex)
             raise

plugins/monitoring/commands.py

@@ -81,16 +81,13 @@ async def install(self) -> bool:
         if await super().install():
             try:
                 async with self.apool.connection() as conn:
-                    await conn.execute("""
-                        UPDATE plugins 
-                        SET version = (
-                            SELECT version FROM plugins WHERE plugin = 'serverstats'
-                        ) 
-                        WHERE plugin = 'monitoring'
-                        """)
-                    cursor = await conn.execute("DELETE FROM plugins WHERE plugin = 'serverstats' RETURNING plugin")
+                    cursor = await conn.execute("SELECT version FROM plugins WHERE plugin = 'serverstats'")
                     row = await cursor.fetchone()
                     if row:
+                        async with conn.transaction():
+                            await conn.execute("UPDATE plugins SET version = %s WHERE plugin = 'monitoring'",
+                                               (row[0], ))
+                            await conn.execute("DELETE FROM plugins WHERE plugin = 'serverstats'")
                         self.log.info("  => Migrating serverstats to monitoring. Restart triggered ...")
                         await self.node.restart()
                 return True