elasticsearch-rails-ha 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 748bbb4ee4cc9113f20ec87b005eef323820e2dd
-  data.tar.gz: 790fb673db28fe20541f83adf4de318ee6a32672
+  metadata.gz: 9d15db1d837bdf59bce06cb1f7fec6620f792053
+  data.tar.gz: e0cc52d79063153b7efa2b47ce5b334b5743754c
 SHA512:
-  metadata.gz: 6349e7e66da0a4c339349fefd249d0f5714fdf85ac80b27a40552c84de1fb77f2551118a1c74f2914d214ea8b5aa87def419ea67df226e8ceda2431527a2d3ae
-  data.tar.gz: 4a67410a828da167f67a7ef4938dc7f1e4926ae608e587808d5862b616a8dc541700206d19cd3466621bb9a6c0a1bf941aca7549cbdfa20dc8d805f039b94a89
+  metadata.gz: eb7d6ac63a2247a4f72e922e3b4bb2ab6e474c775609c73f06fec4267e4155f2ae2a5e748e21ac361acc4310ecd4270097ca6cd04f7708ec9bb1f98f3c8b89d1
+  data.tar.gz: 110a2572722c5a5b1c578243183695c47376bb41889bf748a5be6ee27be07ea85d54bfd975d124fa4afcc171e6db9c9e810862d1653640f717ab49df244c3c09

data/lib/elasticsearch/rails/ha/index_stager.rb

@@ -1,106 +1,23 @@
+require 'elasticsearch/index_stager'
+
 module Elasticsearch
   module Rails
     module HA
-      class IndexStager
+      class IndexStager < Elasticsearch::IndexStager
         attr_reader :klass, :live_index_name
 
         def initialize(klass)
           @klass = klass.constantize
+          @index_name = @klass.index_name
+          @es_client = @klass.__elasticsearch__.client
         end
 
         def stage_index_name
           if klass.respond_to?(:stage_index_name)
             klass.stage_index_name
           else
-            klass.index_name + "_staged"
-          end
-        end
-
-        def tmp_index_name
-          @_suffix ||= Time.now.strftime('%Y%m%d%H%M%S') + '-' + SecureRandom.hex[0..7]
-          "#{klass.index_name}_#{@_suffix}"
-        end
-
-        def alias_stage_to_tmp_index
-          es_client.indices.delete index: stage_index_name rescue false
-          es_client.indices.update_aliases body: {
-            actions: [
-              { add: { index: tmp_index_name, alias: stage_index_name } }
-            ]
-          }
-        end
-
-        def promote(live_index_name=klass.index_name)
-          @live_index_name = live_index_name || klass.index_name
-
-          # the renaming actions (performed atomically by ES)
-          rename_actions = [
-            { remove: { index: stage_aliased_to, alias: stage_index_name } },
-            {    add: { index: stage_index_name, alias: @live_index_name } }
-          ]
-
-          # zap any existing index known as index_name,
-          # but do it conditionally since it is reasonable that it does not exist.
-          to_delete = []
-          existing_live_index = es_client.indices.get_aliases(index: @live_index_name)
-          existing_live_index.each do |k,v|
-
-            # if the index is merely aliased, remove its alias as part of the aliasing transaction.
-            if k != @live_index_name
-              rename_actions.unshift({ remove: { index: k, alias: @live_index_name } })
-
-              # mark it for deletion when we've successfully updated aliases
-              to_delete.push k
-
-            else
-              # this is a real, unaliased index with this name, so it must be deleted.
-              # (This usually happens the first time we implement the aliasing scheme against
-              # an existing installation.)
-              es_client.indices.delete index: @live_index_name rescue false
-            end
-          end
-
-          # re-alias
-          es_client.indices.update_aliases body: { actions: rename_actions }
-
-          # clean up
-          to_delete.each do |idxname|
-            es_client.indices.delete index: idxname rescue false
-          end
-        end
-
-        private
-
-        def tmp_index_pattern
-          /#{klass.index_name}_(\d{14})-\w{8}$/
-        end
-
-        def es_client
-          klass.__elasticsearch__.client
-        end
-
-        def stage_aliased_to
-          # find the newest tmp index to which staged is aliased.
-          # we need this because we want to re-alias it.
-          aliased_to = find_newest_alias_for(stage_index_name)
-        end
-
-        def find_newest_alias_for(the_index_name)
-          aliased_to = nil
-          aliases = es_client.indices.get_aliases(index: the_index_name)
-          aliases.each do |k,v|
-            next unless k.match(tmp_index_pattern)
-            aliased_to ||= k
-            alias_tstamp = aliased_to.match(tmp_index_pattern)[1]
-            k_tstamp = k.match(tmp_index_pattern)[1]
-            if Time.parse(alias_tstamp) < Time.parse(k_tstamp)
-              aliased_to = k
-            end
-          end
-          if !aliased_to
-            raise "Cannot identify index aliased to by '#{the_index_name}'"
+            index_name + "_staged"
           end
-          aliased_to
         end
       end
     end

data/lib/elasticsearch/rails/ha/version.rb

@@ -1,7 +1,7 @@
 module Elasticsearch
   module Rails
     module HA
-      VERSION = '1.0.5'
+      VERSION = '1.0.6'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails-ha
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Peter Karman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: elasticsearch-indexstager
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement