don't restore dumps when we already restored pgsql_data

theforeman · Jun 11, 2024 · 438499b · 438499b
1 parent f4c6d5a
commit 438499b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/definitions/scenarios/restore.rb b/definitions/scenarios/restore.rb
@@ -35,7 +35,7 @@ def compose
       add_step_with_context(Procedures::Service::Stop)
       add_steps_with_context(Procedures::Restore::ExtractFiles) if backup.tar_backups_exist?
 
-      if backup.sql_dump_files_exist?
+      if backup.sql_needs_dump_restore?
         add_steps_with_context(Procedures::Restore::DropDatabases)
         restore_sql_dumps(backup)
       end

diff --git a/lib/foreman_maintain/utils/backup.rb b/lib/foreman_maintain/utils/backup.rb
@@ -223,12 +223,20 @@ def tar_backups_exist?
           file_map[:pgsql_data][:present]
       end
 
+      def sql_tar_files_exist?
+        file_map[:pgsql_data][:present]
+      end
+
       def sql_dump_files_exist?
         file_map[:foreman_dump][:present] ||
           file_map[:candlepin_dump][:present] ||
           file_map[:pulpcore_dump][:present]
       end
 
+      def sql_needs_dump_restore?
+        !sql_tar_files_exist? && sql_dump_files_exist?
+      end
+
       def incremental?
         !!metadata.fetch('incremental', false)
       end

diff --git a/test/definitions/scenarios/restore_test.rb b/test/definitions/scenarios/restore_test.rb
@@ -52,7 +52,7 @@ module Scenarios
         refute_scenario_has_step(scenario, Procedures::Restore::ReindexDatabases)
       end
 
-      it 'drops and restores DB dumps if present' do
+      it 'drops and restores DB dumps if present and no DB data present' do
         assume_feature_present(:foreman_database, :configuration => {})
         assume_feature_present(:candlepin_database, :configuration => {})
         assume_feature_present(:pulpcore_database, :configuration => {})
@@ -63,17 +63,41 @@ module Scenarios
             :candlepin_dump => { :present => true },
             :pulpcore_dump => { :present => true },
             :pulp_data => { :present => true },
-            :pgsql_data => { :present => true },
+            :pgsql_data => { :present => false },
             :metadata => { :present => false },
           }
         )
 
+        assert_scenario_has_step(scenario, Procedures::Restore::ExtractFiles)
         assert_scenario_has_step(scenario, Procedures::Restore::DropDatabases)
         assert_scenario_has_step(scenario, Procedures::Restore::ForemanDump)
         assert_scenario_has_step(scenario, Procedures::Restore::CandlepinDump)
         assert_scenario_has_step(scenario, Procedures::Restore::PulpcoreDump)
       end
 
+      it 'does not try to drop/restore DB dumps if present and DB data present' do
+        assume_feature_present(:foreman_database, :configuration => {})
+        assume_feature_present(:candlepin_database, :configuration => {})
+        assume_feature_present(:pulpcore_database, :configuration => {})
+
+        ForemanMaintain::Utils::Backup.any_instance.stubs(:file_map).returns(
+          {
+            :foreman_dump => { :present => true },
+            :candlepin_dump => { :present => true },
+            :pulpcore_dump => { :present => true },
+            :pulp_data => { :present => true },
+            :pgsql_data => { :present => true },
+            :metadata => { :present => false },
+          }
+        )
+
+        assert_scenario_has_step(scenario, Procedures::Restore::ExtractFiles)
+        refute_scenario_has_step(scenario, Procedures::Restore::DropDatabases)
+        refute_scenario_has_step(scenario, Procedures::Restore::ForemanDump)
+        refute_scenario_has_step(scenario, Procedures::Restore::CandlepinDump)
+        refute_scenario_has_step(scenario, Procedures::Restore::PulpcoreDump)
+      end
+
       it 'does not try to drop/restore DB dumps when these are absent' do
         assume_feature_present(:foreman_database, :configuration => {})
         assume_feature_present(:candlepin_database, :configuration => {})