elasticsearch_s3_backup 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 873b7e21f3194143c4dd273e4322343a0f9f6344
-  data.tar.gz: e25e7eaa0608847db2fe70fe45e87a7aea16df2e
+  metadata.gz: 081728682c1244d2281ea3eb51fcd4bbf77e3c38
+  data.tar.gz: b25a45c8f558abc41a53d77cb50f62c2192ada16
 SHA512:
-  metadata.gz: d33d3cef2877c0a0247fde1616da0c4aa87fdd7c6c1298f25a10fc46aef8d6f34d73b42cb2403fb0fd103547b405fd985ff4563807d6ba4b68eebd319351e5f0
-  data.tar.gz: 5d38407897c26c38abe0b4734cf4f32c44bc7a1b35b1c2db7ced2911fc58a6111e944c1467c29b0c9772156f9f637220e38256820a1d7311f13721921cdce1ef
+  metadata.gz: ae09000b630cc92a3762906230c1bf5d0e2a1bd9c05219d36975f24b26656f6be0b472f022b97de8ff91bf8eae94dc0cd530c3b7bf2735fae38fef62e35b295f
+  data.tar.gz: 22bccb3af01e88c01f6641a99a59ffa23b3e16d812935f0d0ee9e20491ec70dd283f00f535bcd1fbf5d95dd3e132b71f22c1fecf184915f194b9ac3ae11d14c1

data/lib/elasticsearch_s3_backup.rb

@@ -23,6 +23,45 @@ module EverTools
 
     attr_reader :conf, :backup_repo, :snapshot_label
 
+    # rubocop:disable Metrics/AbcSize, Lint/RescueException
+    def run
+      unless master?
+        logger.info 'This node is not the currently elected master. Exiting.'
+        exit
+      end
+
+      cleanup_test_indexes
+      insert_test_data
+
+      # Create a new repo if none exists (typically at beginning of month)
+      create_repo unless es_api.snapshot.get_repository[backup_repo]
+      create_snapshot
+
+      restore_test_index
+      # Compare each doc in the original backup_test index to the restored index
+      logger.info "Verifying the newly-restored #{@backup_test_index}…"
+      test_size.times { |i| compare_index_item! i }
+      logger.info 'Successfully verified the test data!'
+      delete_test_indexes
+
+      remove_expired_backups
+      logger.info 'Finished'
+    rescue Interrupt => e
+      puts "Received #{e.class}"
+      exit 99
+    rescue SignalException => e
+      logger.info "Received: #{e.signm} (#{e.signo})"
+      exit 2
+    rescue SystemExit => e
+      exit e.status
+    rescue Exception => e # Need to rescue "Exception" so that Sentry gets it
+      notify e
+      logger.fatal e.message
+      logger.fatal e.backtrace.join("\n")
+      raise e
+    end
+    # rubocop:enable Metrics/AbcSize, Lint/RescueException
+
     def initialize
       @conf = OpenStruct.new(YAML.load_file('/etc/s3_backup.yml'))
 
@@ -40,6 +79,8 @@ module EverTools
       @snapshot_label     = now.strftime '%m-%d_%H%M'
     end
 
+    private
+
     def logger
       @logger ||= Logger.new(conf['log']).tap { |l| l.progname = 's3_backup' }
     end
@@ -139,7 +180,7 @@ module EverTools
 
     def restore_test_index
       # Restore just the backup_test index to a new index
-      logger.info 'Restoring the backup_test index…'
+      logger.info "Restoring the #{@backup_test_index} index to #{@restore_test_index}…"
       es_api.snapshot.restore repository: backup_repo,
                               snapshot: snapshot_label,
                               wait_for_completion: true,
@@ -165,57 +206,18 @@ module EverTools
     end
 
     def delete_test_indexes
-      tries ||= 1
       [@restore_test_index, @backup_test_index].each do |test_index|
         es_api.indices.delete index: test_index
       end
     end
 
     def cleanup_test_indexes
-      logger.info "Removing remnant test indexes..."
+      logger.info 'Removing remnant test indexes...'
       # Gather backup test indices
-      es_api.indices.get(index: 'backup_test_*').each do |test_index, value|
+      es_api.indices.get(index: 'backup_test_*').each do |test_index, _value|
         # Check again that they are backup test indices
         es_api.indices.delete index: test_index if test_index =~ /backup_test_(.*)/
       end
     end
-    
-    # rubocop:disable Metrics/AbcSize, Lint/RescueException
-    def run
-      unless master?
-        logger.info 'This node is not the currently elected master. Exiting.'
-        exit
-      end
-
-      cleanup_test_indexes 
-      insert_test_data
-
-      # Create a new repo if none exists (typically at beginning of month)
-      create_repo unless es_api.snapshot.get_repository[backup_repo]
-      create_snapshot
-      restore_test_index
-      # Compare each doc in the original backup_test index to the restored index
-      logger.info "Verifying the newly-restored #{@backup_test_index}…"
-      test_size.times { |i| compare_index_item! i }
-      logger.info 'Successfully verified the test data!'
-      delete_test_indexes
-
-      remove_expired_backups
-      logger.info 'Finished'
-    rescue Interrupt => e
-      puts "Received #{e.class}"
-      exit 99
-    rescue SignalException => e
-      logger.info "Received: #{e.signm} (#{e.signo})"
-      exit 2
-    rescue SystemExit => e
-      exit e.status
-    rescue Exception => e # Need to rescue "Exception" so that Sentry gets it
-      notify e
-      logger.fatal e.message
-      logger.fatal e.backtrace.join("\n")
-      raise e
-    end
-    # rubocop:enable Metrics/AbcSize, Lint/RescueException
   end
 end

data/lib/elasticsearch_s3_backup/version.rb

@@ -1,5 +1,5 @@
 module EverTools
   class ElasticsearchS3Backup
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_s3_backup
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler