foreman_maintain 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 582123528806343d919cd45a9503596cd5edb30144742aa579f65a7c65eaa5a4
-  data.tar.gz: 2735882675a774b98aeb7d41c361bdee8707bf2c25235f420b3cb6cd49e2df7e
+SHA1:
+  metadata.gz: 0fce23af3f0916264faaf404caa0164321bcb17d
+  data.tar.gz: f65633719449de4778bdc7d5eb6e328ad4b130d3
 SHA512:
-  metadata.gz: 02b5862caf25490bcfa6e8aebcae31ada850eee4492381400255cf9de651ca1e862d5a564b9178c7f239226d2c9ddca0cfb200880d112e2939db97b8ac28ca41
-  data.tar.gz: 7fa363c783df0e07e8cec7dd086001e8e082f156c6e512766579484f16ca69d014b2944a320faae65747f7695a83e81c347def707a122335819546ae254f0b8f
+  metadata.gz: 11b1ad761ebc5e73f2c4d211246f68825b1cf698b3d2ab7c8f60603d63005e57c0044b38b16ed9489b3ec8ae93bc5f79a4ece069e73760d600debe4ee37c8481
+  data.tar.gz: 7fb92a17ea9e84cbc480844887580128887f915bdee78e88543581bc611c7fe5253694d26abed0363f082314e5e6686e7d7d079fbe3d5344a24ec2b9a3aedf2a

data/definitions/features/mongo.rb

@@ -30,6 +30,10 @@ class Features::Mongo < ForemanMaintain::Feature
   end
 
   def initialize
+    reload_db_config
+  end
+
+  def reload_db_config
     @configuration = load_db_config(config_file)
   end
 

data/definitions/procedures/restore/configs.rb

@@ -14,6 +14,7 @@ module Procedures::Restore
         spinner.update('Restoring configs')
         clean_conflicting_data
         restore_configs(backup)
+        reload_configs
       end
     end
 
@@ -30,6 +31,10 @@ module Procedures::Restore
       feature(:tar).run(tar_options)
     end
 
+    def reload_configs
+      feature(:mongo).reload_db_config if feature(:mongo)
+    end
+
     private
 
     def clean_conflicting_data

data/definitions/procedures/restore/ensure_mongo_engine_matches.rb

@@ -0,0 +1,35 @@
+module Procedures::Restore
+  class EnsureMongoEngineMatches < ForemanMaintain::Procedure
+    metadata do
+      description 'Ensure restored MongoDB storage engine matches the current DB'
+      for_feature :mongo
+    end
+
+    # rubocop:disable Metrics/AbcSize
+    def run
+      if feature(:mongo).local? && mongo_data_dir_exists? && engine_mismatch?
+        with_spinner('Clean MongoDB data') do |spinner|
+          feature(:service).handle_services(spinner, 'stop', :only => feature(:mongo).services)
+          spinner.update('Clean MongoDB data')
+          data_path = Dir[feature(:mongo).data_dir + '/*']
+          FileUtils.rm_rf(data_path)
+          FileUtils.rm_rf('/var/tmp/mongodb_engine_upgrade')
+          feature(:service).handle_services(spinner, 'start', :only => feature(:mongo).services)
+        end
+      end
+    end
+    # rubocop:enable Metrics/AbcSize
+
+    private
+
+    def engine_mismatch?
+      tiger_file = File.join(feature(:mongo).data_dir, 'WiredTiger.wt')
+      config_file = feature(:mongo).core.server_config_files.first
+      File.exist?(tiger_file) && File.open(config_file).grep(/^storage.engine:\s*mmapv1/).any?
+    end
+
+    def mongo_data_dir_exists?
+      File.directory?(feature(:mongo).data_dir)
+    end
+  end
+end

data/definitions/procedures/restore/installer_reset.rb

@@ -2,19 +2,11 @@ module Procedures::Restore
   class InstallerReset < ForemanMaintain::Procedure
     metadata do
       description 'Run installer reset'
-
-      param :incremental_backup,
-            'Is the backup incremental?'
     end
 
     def run
-      with_spinner('Resetting') do |spinner|
-        if @incremental_backup
-          spinner.update('Skipping installer reset for incremental update')
-        else
-          spinner.update('Installer reset')
-          execute!(installer_cmd)
-        end
+      with_spinner('Installer reset') do
+        execute!(installer_cmd)
       end
     end
 

data/definitions/scenarios/restore.rb

@@ -19,9 +19,12 @@ module ForemanMaintain::Scenarios
                              Procedures::Restore::Confirmation,
                              Checks::Restore::ValidateHostname,
                              Procedures::Selinux::SetFileSecurity,
-                             Procedures::Restore::Configs,
-                             Procedures::Restore::InstallerReset,
-                             Procedures::Service::Stop)
+                             Procedures::Restore::Configs)
+      unless backup.incremental?
+        add_steps_with_context(Procedures::Restore::EnsureMongoEngineMatches,
+                               Procedures::Restore::InstallerReset)
+      end
+      add_step_with_context(Procedures::Service::Stop)
       add_steps_with_context(Procedures::Restore::ExtractFiles) if backup.tar_backups_exist?
       drop_dbs(backup)
       if backup.sql_dump_files_exist? && feature(:instance).postgresql_local?
@@ -84,8 +87,7 @@ module ForemanMaintain::Scenarios
                   Procedures::Restore::MongoDump => :backup_dir)
 
       context.map(:incremental_backup,
-                  Procedures::Selinux::SetFileSecurity => :incremental_backup,
-                  Procedures::Restore::InstallerReset => :incremental_backup)
+                  Procedures::Selinux::SetFileSecurity => :incremental_backup)
     end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -212,6 +212,7 @@ files:
 - definitions/procedures/restore/configs.rb
 - definitions/procedures/restore/confirmation.rb
 - definitions/procedures/restore/drop_databases.rb
+- definitions/procedures/restore/ensure_mongo_engine_matches.rb
 - definitions/procedures/restore/extract_files.rb
 - definitions/procedures/restore/foreman_dump.rb
 - definitions/procedures/restore/installer_reset.rb
@@ -326,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt