elasticsearch-rails-ha 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3edf0960f65de6832e0838da6ff9fa2c064b022
-  data.tar.gz: b673ce9d56d28dec663d6ae4a3351d0f6b12104a
+  metadata.gz: 748bbb4ee4cc9113f20ec87b005eef323820e2dd
+  data.tar.gz: 790fb673db28fe20541f83adf4de318ee6a32672
 SHA512:
-  metadata.gz: cc334e3f30141418397bf0a0cffe3ece7bf7e2eea5793c462df8cc9477d1adf58696e463e6f272f98cde3280f47beac5159b50449c0a83947019d8d74f962e1f
-  data.tar.gz: 4e599b2d3c396a90493ca4a7421cf003ee5e8c18b038085610ae65533b701d11dc6aa582bb76f2b0bbae6ff152f8b11a2a4877ad1bea8eed3174dd83bbca6a61
+  metadata.gz: 6349e7e66da0a4c339349fefd249d0f5714fdf85ac80b27a40552c84de1fb77f2551118a1c74f2914d214ea8b5aa87def419ea67df226e8ceda2431527a2d3ae
+  data.tar.gz: 4a67410a828da167f67a7ef4938dc7f1e4926ae608e587808d5862b616a8dc541700206d19cd3466621bb9a6c0a1bf941aca7549cbdfa20dc8d805f039b94a89

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

@@ -31,23 +31,23 @@ module Elasticsearch
         end
 
         def promote(live_index_name=klass.index_name)
-          @live_index_name = live_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 } }
+            {    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 = 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 != klass.index_name
-              rename_actions.unshift({ remove: { index: k, alias: live_index_name } })
+            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
@@ -56,7 +56,7 @@ module Elasticsearch
               # 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
+              es_client.indices.delete index: @live_index_name rescue false
             end
           end
 
@@ -82,18 +82,23 @@ module Elasticsearch
         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
-          stage_aliases = es_client.indices.get_aliases(index: stage_index_name)
-          stage_aliases.each do |k,v|
+          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
-            stage_tstamp = aliased_to.match(tmp_index_pattern)[1]
+            alias_tstamp = aliased_to.match(tmp_index_pattern)[1]
             k_tstamp = k.match(tmp_index_pattern)[1]
-            if Time.parse(stage_tstamp) < Time.parse(k_tstamp)
+            if Time.parse(alias_tstamp) < Time.parse(k_tstamp)
               aliased_to = k
             end
           end
           if !aliased_to
-            raise "Cannot identify index aliased to by '#{stage_index_name}'"
+            raise "Cannot identify index aliased to by '#{the_index_name}'"
           end
           aliased_to
         end

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

@@ -19,6 +19,11 @@ module Elasticsearch
           @verbose    = opts[:verbose]
           @scope      = opts[:scope]
 
+          # make sure klass is not a simple string
+          if @klass.is_a?(String)
+            @klass = @klass.constantize
+          end
+
           # calculate array of offsets based on nprocs
           @total_expected = klass.count
           @pool_size = (@total_expected / @nprocs.to_f).ceil

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

@@ -54,7 +54,7 @@ namespace :elasticsearch do
       klass = ENV['CLASS'] or fail "CLASS required"
       stager = Elasticsearch::Rails::HA::IndexStager.new(klass)
       stager.promote(ENV['INDEX'])
-      puts "[#{Time.now.utc.iso8601}] #{klass} promoted #{stage_index_name} to #{stager.live_index_name}"
+      puts "[#{Time.now.utc.iso8601}] #{klass} promoted #{stager.stage_index_name} to #{stager.live_index_name}"
     end
 
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails-ha
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Peter Karman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model