fix(gorgone): mbi unable to rebuild partial data with new scripts (#1190

)
centreon · Mar 31, 2023 · ab50fcf · ab50fcf
1 parent 6d898ac
commit ab50fcf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/gorgone/gorgone/modules/centreon/mbi/etl/event/main.pm b/gorgone/gorgone/modules/centreon/mbi/etl/event/main.pm
@@ -83,13 +83,22 @@ sub deleteEntriesForRebuild {
                 "DELETE FROM $options{name} WHERE time_id >= " . $utils->getDateEpoch($options{start}) . " AND time_id < " . $utils->getDateEpoch($options{end})
             ];
 	} else {
+        my $structure = $biTables->dumpTableStructure($options{name});
         my $partitionsPerf = $utils->getRangePartitionDate($options{start}, $options{end});
         foreach (@$partitionsPerf) {
-            push @$sql,
-                [
-                    "[PURGE] Truncate partition $_->{name} on table [$options{name}]",
-                    "ALTER TABLE $options{name} TRUNCATE PARTITION p$_->{name}"
-                ];
+            if ($structure =~ /p$_->{name}/m) {
+                push @$sql,
+                    [
+                        "[PURGE] Truncate partition $_->{name} on table [$options{name}]",
+                        "ALTER TABLE $options{name} TRUNCATE PARTITION p$_->{name}"
+                    ];
+            } else {
+                push @$sql,
+                    [
+                        '[PARTITIONS] Add partition [p' . $_->{name} . '] on table [' . $options{name} . ']',
+                        "ALTER TABLE `$options{name}` ADD PARTITION (PARTITION `p$_->{name}` VALUES LESS THAN(" . $_->{epoch} . "))"
+                    ];
+            }
         }
 	}
 

diff --git a/gorgone/gorgone/modules/centreon/mbi/etl/perfdata/main.pm b/gorgone/gorgone/modules/centreon/mbi/etl/perfdata/main.pm
@@ -83,13 +83,22 @@ sub deleteEntriesForRebuild {
                 "DELETE FROM $options{name} WHERE time_id >= " . $utils->getDateEpoch($options{start}) . " AND time_id < " . $utils->getDateEpoch($options{end})
             ];
 	} else {
+        my $structure = $biTables->dumpTableStructure($options{name});
         my $partitionsPerf = $utils->getRangePartitionDate($options{start}, $options{end});
         foreach (@$partitionsPerf) {
-            push @$sql,
-                [
-                    "[PURGE] Truncate partition $_->{name} on table [$options{name}]",
-                    "ALTER TABLE $options{name} TRUNCATE PARTITION p$_->{name}"
-                ];
+            if ($structure =~ /p$_->{name}/m) {
+                push @$sql,
+                    [
+                        "[PURGE] Truncate partition $_->{name} on table [$options{name}]",
+                        "ALTER TABLE $options{name} TRUNCATE PARTITION p$_->{name}"
+                    ];
+            } else {
+                push @$sql,
+                    [
+                        '[PARTITIONS] Add partition [p' . $_->{name} . '] on table [' . $options{name} . ']',
+                        "ALTER TABLE `$options{name}` ADD PARTITION (PARTITION `p$_->{name}` VALUES LESS THAN(" . $_->{epoch} . "))"
+                    ];
+            }
         }
 	}