Merge pull request #558 from cpanel/RE-974

Only perform mysql database is corrupted check in start mode
cpanel · Nov 25, 2024 · 7c3dfe2 · 7c3dfe2
2 parents 27de904 + dfed53c
commit 7c3dfe2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/elevate-cpanel b/elevate-cpanel
@@ -4020,6 +4020,8 @@ EOS
 
     sub _blocker_mysql_database_corrupted ($self) {
 
+        return 0 if $self->is_check_mode();
+
         return 0 unless Cpanel::MysqlUtils::MyCnf::Basic::is_local_mysql();
 
         if ( !Cpanel::MysqlUtils::Running::is_mysql_running() ) {

diff --git a/lib/Elevate/Components/MySQL.pm b/lib/Elevate/Components/MySQL.pm
@@ -369,6 +369,8 @@ sub _blocker_mysql_upgrade_in_progress ($self) {
 
 sub _blocker_mysql_database_corrupted ($self) {
 
+    return 0 if $self->is_check_mode();
+
     # Do not perform this check for remote mysql
     return 0 unless Cpanel::MysqlUtils::MyCnf::Basic::is_local_mysql();
 

diff --git a/t/components-MySQL.t b/t/components-MySQL.t
@@ -271,6 +271,17 @@ EOS
     $restart_mysql    = 0;
     @ssystem_output   = ();
 
+    my $mock_elevate_comp = Test::MockModule->new('Elevate::Components');
+    $mock_elevate_comp->redefine(
+        is_check_mode => 1,
+    );
+
+    is( $db->_blocker_mysql_database_corrupted(), 0, 'The check is a noop in check mode' );
+
+    $mock_elevate_comp->redefine(
+        is_check_mode => 0,
+    );
+
     like(
         $db->_blocker_mysql_database_corrupted(),
         {