Fix louislam#5087 and fix migration state (louislam#5260)

harryzcy · Oct 27, 2024 · 277d6fe · 277d6fe
1 parent 46d8744
commit 277d6fe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/db/knex_migrations/2024-11-27-1927-fix-info-json-data-type.js b/db/knex_migrations/2024-11-27-1927-fix-info-json-data-type.js
@@ -0,0 +1,13 @@
+// Update info_json column to LONGTEXT mainly for MariaDB
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor_tls_info", function (table) {
+            table.text("info_json", "longtext").alter();
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor_tls_info", function (table) {
+        table.text("info_json", "text").alter();
+    });
+};
diff --git a/server/database.js b/server/database.js
@@ -775,8 +775,6 @@ class Database {
             await migrationServer.start(port, hostname);
         }
 
-        await Settings.set("migrateAggregateTableState", "migrating");
-
         log.info("db", "Migrating Aggregate Table");
 
         log.info("db", "Getting list of unique monitors");
@@ -799,6 +797,8 @@ class Database {
             }
         }
 
+        await Settings.set("migrateAggregateTableState", "migrating");
+
         let progressPercent = 0;
         let part = 100 / monitors.length;
         let i = 1;