Do not account for metadata size if old settings are detected

netdata · Apr 29, 2024 · fbec2cb · fbec2cb
1 parent a9b5cb2
commit fbec2cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/daemon/main.c b/src/daemon/main.c
@@ -1033,9 +1033,6 @@ static void backwards_compatible_config() {
     config_move(CONFIG_SECTION_GLOBAL,  "dbengine multihost disk space",
                 CONFIG_SECTION_DB,      "dbengine multihost disk space MB");
 
-    config_move(CONFIG_SECTION_DB,      "dbengine multihost disk space MB",
-                CONFIG_SECTION_DB,      "dbengine tier 0 disk space MB");
-
     config_move(CONFIG_SECTION_GLOBAL,  "memory deduplication (ksm)",
                 CONFIG_SECTION_DB,      "memory deduplication (ksm)");
 

diff --git a/src/database/rrdhost.c b/src/database/rrdhost.c
@@ -897,7 +897,6 @@ void dbengine_init(char *hostname) {
 
     new_dbengine_defaults =
         (!config_exists(CONFIG_SECTION_DB, "dbengine disk space MB") &&
-         !config_exists(CONFIG_SECTION_DB, "dbengine multihost disk space MB") &&
          !config_exists(CONFIG_SECTION_DB, "dbengine tier 1 update every iterations") &&
          !config_exists(CONFIG_SECTION_DB, "dbengine tier 2 update every iterations") &&
          !config_exists(CONFIG_SECTION_DB, "dbengine tier 3 update every iterations") &&
@@ -966,17 +965,17 @@ void dbengine_init(char *hostname) {
                 divisor *= 2;
             disk_space_mb = default_multidb_disk_quota_mb / divisor;
 
-            char dbengineconfig_new[200 + 1];
-            // Move sections
-            if (tier > 0)
-                snprintfz(dbengineconfig, sizeof(dbengineconfig) - 1, "dbengine tier %zu multihost disk space MB", tier);
-            else
-                snprintfz(dbengineconfig, sizeof(dbengineconfig) - 1, "dbengine multihost disk space MB");
-
-
-            snprintfz(dbengineconfig_new, sizeof(dbengineconfig_new) - 1, "dbengine tier %zu MB", tier);
-            config_move(CONFIG_SECTION_DB, dbengineconfig, CONFIG_SECTION_DB, dbengineconfig_new);
-            disk_space_mb = config_get_number(CONFIG_SECTION_DB, dbengineconfig_new, tier_quota_mb[tier]);
+//            char dbengineconfig_new[200 + 1];
+//            // Move sections
+//            if (tier > 0)
+//                snprintfz(dbengineconfig, sizeof(dbengineconfig) - 1, "dbengine tier %zu multihost disk space MB", tier);
+//            else
+//                snprintfz(dbengineconfig, sizeof(dbengineconfig) - 1, "dbengine multihost disk space MB");
+//
+//
+//            snprintfz(dbengineconfig_new, sizeof(dbengineconfig_new) - 1, "dbengine tier %zu MB", tier);
+//            config_move(CONFIG_SECTION_DB, dbengineconfig, CONFIG_SECTION_DB, dbengineconfig_new);
+//            disk_space_mb = config_get_number(CONFIG_SECTION_DB, dbengineconfig_new, tier_quota_mb[tier]);
 
             grouping_iterations = storage_tiers_grouping_iterations[tier];
             if (tier > 0) {
@@ -991,6 +990,7 @@ void dbengine_init(char *hostname) {
                 }
             }
             storage_tiers_grouping_iterations[tier] = grouping_iterations;
+            storage_tiers_retention_days[tier] = 0;
         }
 
 

diff --git a/src/database/sqlite/sqlite_functions.c b/src/database/sqlite/sqlite_functions.c
@@ -360,6 +360,9 @@ void sqlite_close_databases(void)
 
 uint64_t get_total_database_space(void)
 {
+    if (!new_dbengine_defaults)
+        return 0;
+
     uint64_t database_space = sqlite_get_meta_space() + sqlite_get_context_space();
 #ifdef ENABLE_ML
     database_space +=  sqlite_get_ml_space();