elasticsearch_s3_backup 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc0fd72a92d1558e5220e4c9e29890fc7a42a5ef
-  data.tar.gz: 6728b0a29e270e15d12cf471930663e6bb4e8bc9
+  metadata.gz: 5a73dd8a14f8349c15f7025f1fbbea90772fb4f7
+  data.tar.gz: ee6bf2602aad552ca523ee12d434dd709cba4bd6
 SHA512:
-  metadata.gz: 8383b52217f7b1e8ce01b6bee2a4360a548c4f73436922aa525ec2ba77bf462ace38c29589f4547c589bfd0f0f6315742d9640e8c49773a575b3161aaba694fd
-  data.tar.gz: 8f5f0cf9324f4615310c892f66418ef4ae8d786c74d04388a14e7e7150e26b6a375682dab3b3dfe8bb9f7b565ae7ca691a2d5a4f4a3de33eb4b86ec6e1220e16
+  metadata.gz: a7a8a347d841836fadf6e93af7f8d77907c068312fd1aa62869ecaeb179579e20ebe4d500072b69133aac8107ebd622b3d575035ef19b26e80c7030e419505e4
+  data.tar.gz: 5a23239b7b560133892b696fb695ab4276d102d47e09440fefc925738f55ebde7b897a7de77d228239a594a0c95d465cd1bcb7695598123fe903c06fbafaa942

data/lib/elasticsearch_s3_backup/version.rb

@@ -1,5 +1,5 @@
 module EverTools
   class ElasticsearchS3Backup
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

data/lib/elasticsearch_s3_backup.rb

@@ -21,7 +21,7 @@ module EverTools
                    :elasticsearch_auth_file,
                    :cluster_name
 
-    attr_reader :conf, :backup_repo
+    attr_reader :conf, :backup_repo, :snapshot_label
 
     def initialize
       @conf = OpenStruct.new(YAML.load_file('/etc/s3_backup.yml'))
@@ -61,7 +61,12 @@ module EverTools
     def es_api
       @es_api ||= begin
         es_host = @conf['es_host'] || 'localhost'
-        Elasticsearch::Client.new host: "http://#{auth}@#{es_host}:9200"
+        Elasticsearch::Client.new host: "http://#{auth}@#{es_host}:9200",
+                                  transport_options: {
+                                    request: {
+                                      timeout: 1200
+                                    }
+                                  }
       end
     end
 
@@ -89,13 +94,13 @@ module EverTools
       new_repo_params = new_repo_params.merge(
         type: 's3',
         settings: {
-          base_path: "/elasticsearch/#{cluster_name}/#{conf['env']}/#{@backup_repo}",
+          base_path: "/elasticsearch/#{cluster_name}/#{conf['env']}/#{backup_repo}",
           server_side_encryption: true
         }
       )
 
       logger.info 'Creating a new monthly ES backup repo…'
-      es_api.snapshot.create_repository repository: @backup_repo,
+      es_api.snapshot.create_repository repository: backup_repo,
                                         body: new_repo_params
     end
 
@@ -120,21 +125,21 @@ module EverTools
 
     def create_snapshot
       # Make a backup (full on new month, incremental otherwise)
-      logger.info "Starting a new backup (#{backup_repo}/#{@snapshot_label})…"
-      r = es_api.snapshot.create repository: @backup_repo,
-                                 snapshot: @snapshot_label,
+      logger.info "Starting a new backup (#{backup_repo}/#{snapshot_label})…"
+      r = es_api.snapshot.create repository: backup_repo,
+                                 snapshot: snapshot_label,
                                  wait_for_completion: true
+      fail "Snapshot failed! #{r.inspect}" if r['snapshot']['failures'].any?
       logger.info 'Snapshot complete. Time: ' \
                   "#{r['snapshot']['duration_in_millis']}. " \
                   "Results: #{r['snapshot']['shards'].inspect}"
-      fail "Snapshot failed! #{r.inspect}" if r['snapshot']['failures'].any?
     end
 
     def restore_test_index
       # Restore just the backup_test index to a new index
       logger.info 'Restoring the backup_test index…'
-      es_api.snapshot.restore repository: @backup_repo,
-                              snapshot: @snapshot_label,
+      es_api.snapshot.restore repository: backup_repo,
+                              snapshot: snapshot_label,
                               wait_for_completion: true,
                               body: {
                                 indices: @backup_test_index,
@@ -195,7 +200,7 @@ module EverTools
     rescue Exception => e # Need to rescue "Exception" so that Sentry gets it
       notify e
       logger.fatal e.message
-      logger.fatal e.backtrace
+      logger.fatal e.backtrace.join("\n")
       raise e
     end
     # rubocop:enable Metrics/AbcSize, Lint/RescueException

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_s3_backup
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Eric Herot