elasticsearch_s3_backup 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081728682c1244d2281ea3eb51fcd4bbf77e3c38
-  data.tar.gz: b25a45c8f558abc41a53d77cb50f62c2192ada16
+  metadata.gz: b4858fa0862e04b674d69efb32506e2f1736866a
+  data.tar.gz: 569033bcb7439fadea70e55fd17e40bdae1bcd88
 SHA512:
-  metadata.gz: ae09000b630cc92a3762906230c1bf5d0e2a1bd9c05219d36975f24b26656f6be0b472f022b97de8ff91bf8eae94dc0cd530c3b7bf2735fae38fef62e35b295f
-  data.tar.gz: 22bccb3af01e88c01f6641a99a59ffa23b3e16d812935f0d0ee9e20491ec70dd283f00f535bcd1fbf5d95dd3e132b71f22c1fecf184915f194b9ac3ae11d14c1
+  metadata.gz: 360fd85e6fcd21746a49504c8b5d4c61c1e7605d135e64643cdfac3f52a424ecb446e329ce442fa8974e581d562eb06950a835741d6db3ab9de6aebdb46bdc7d
+  data.tar.gz: 85a5d1d8738dde41f5b3763ec13393491190e85dc1779a55d69111434fc68fe2bb0ffa3d5f64e254b645f5244a1d4ec9548225708e00c30465fde8f4ebad8a4d

data/lib/elasticsearch_s3_backup.rb

@@ -6,6 +6,7 @@ require 'pagerduty'
 require 'yaml'
 require 'sentry-raven'
 require 'ostruct'
+require 'hashie'
 require 'elasticsearch'
 
 module EverTools
@@ -30,6 +31,8 @@ module EverTools
         exit
       end
 
+      check_cluster_state!
+
       cleanup_test_indexes
       insert_test_data
 
@@ -117,6 +120,14 @@ module EverTools
       es_api.nodes.info['nodes'][es_api.cluster.state['master_node']]['name'] == node_name
     end
 
+    def check_cluster_state!
+      cluster_settings = Hashie::Mash.new es_api.cluster.get_settings
+      if cluster_settings.transient_.cluster_.routing_.allocation_.enable == 'none'
+        fail 'Shard reallocation is disabled. Snapshot cannot proceed because creating the test ' \
+             'index in this state will put the cluster into RED state.'
+      end
+    end
+
     def pseudo_random_string
       'a' + rand(10**100).to_s
     end
@@ -207,6 +218,7 @@ module EverTools
 
     def delete_test_indexes
       [@restore_test_index, @backup_test_index].each do |test_index|
+        logger.info "Removing test index: #{test_index}"
         es_api.indices.delete index: test_index
       end
     end
@@ -215,8 +227,10 @@ module EverTools
       logger.info 'Removing remnant test indexes...'
       # Gather backup test indices
       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_(.*)/
+        if test_index =~ /backup_test_(.*)/ # Check again that they are backup test indices
+          logger.info "Removing test index: #{test_index}"
+          es_api.indices.delete index: test_index
+        end
       end
     end
   end

data/lib/elasticsearch_s3_backup/version.rb

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

metadata

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