flapjack 1.2.0rc2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b10a01932fb4fd6a466e2b975764c3c6ff777e9c
-  data.tar.gz: e25026116bccc9209d8ca98c05585e89dc4b7ce3
+  metadata.gz: 04d31109d0b39ced29a1b027a0894cab07b9d4c0
+  data.tar.gz: 86e20fc3b3f0d34acca6be7e33468fc3d609e868
 SHA512:
-  metadata.gz: d1e4aeba827545b5b18bc56bd549adff1b93b43bf368cd426d37b847c2d2801ea4e83f22c1af4e87579e947cf8d911a2abcb6025d778d476abcaad4b2ac934ab
-  data.tar.gz: e6956faf10c9a12bf9cd08bf56fbe87be986063967ec27e35e77b5ed313b8a3cff6b50ea14a5d58019b9b8f4c29f6bad483d0ecf739e7a0f609f26e3d9dedfeb
+  metadata.gz: a838f02684a7cee3ba40cc5be1ecfa2e3b15246912a7bff218944b323f14d43ef64ebce1e9ce978f37795b17d44acc4ec708f4a8768e9788df339a20619f1892
+  data.tar.gz: 93784a164826ef9af3bf84b947d0debdbf21acf3e601ee809c248534d52e0af2cbea643e5cd7ab2c4af4e14a7b8b6ced725883739ecd148ae11f3492a4771f4a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 1.2.0 - 2014-11-07
+- Bug: multi blocks for safe redis connection pool usage #694 (@ali-graham)
+- Bug: data migration to work around previous notification rule bug #699 (@ali-graham)
+
 # 1.2.0rc2 - 2014-10-17
 - Feature: Cache entity and check name <-> id lookups #682 (@ali-graham)
 - Chore: Add last_change field to status_reports in the API (closes: #678) #679 (@Hobbsee)

data/Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get install -y gnupg
 RUN gpg --keyserver keys.gnupg.net --recv-keys 803709B6
 RUN gpg -a --export 803709B6 | apt-key add -
 
-RUN echo "deb http://packages.flapjack.io/deb/1.0 trusty main" | tee /etc/apt/sources.list.d/flapjack.list
+RUN echo "deb http://packages.flapjack.io/deb/v1 trusty main" | tee /etc/apt/sources.list.d/flapjack.list
 RUN apt-get update
 RUN apt-cache policy flapjack
 RUN apt-get install -y flapjack

data/Gemfile

@@ -8,7 +8,7 @@ end
 
 group :test do
   gem 'rspec', '~> 3.0'
-  gem 'cucumber'
+  gem 'cucumber', '>= 2.0.0.beta.3'
   gem 'delorean'
   gem 'rack-test'
   gem 'pact'
@@ -22,8 +22,9 @@ group :test do
   gem 'fuubar'
   gem 'simplecov', :require => false
 
-  if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
-    gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
-    gem 'perftools.rb'
-  end
+  # # Not compiling under 1.9.3-p550 anyway
+  # if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
+  #   gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
+  #   gem 'perftools.rb'
+  # end
 end

data/Gemfile-ruby1.9

@@ -8,7 +8,7 @@ end
 
 group :test do
   gem 'rspec', '~> 3.0'
-  gem 'cucumber'
+  gem 'cucumber', '>= 2.0.0.beta.3'
   gem 'delorean'
   gem 'rack-test'
   gem 'pact'
@@ -22,8 +22,9 @@ group :test do
   gem 'fuubar'
   gem 'simplecov', :require => false
 
-  if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
-    gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
-    gem 'perftools.rb'
-  end
+  # # Not compiling under 1.9.3-p550 anyway
+  # if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
+  #   gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
+  #   gem 'perftools.rb'
+  # end
 end

data/Gemfile-ruby1.9.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flapjack (1.2.0rc2)
+    flapjack (1.2.0)
       activesupport (~> 3.2.14)
       blather (~> 0.8.3)
       chronic
@@ -31,7 +31,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.19)
+    activesupport (3.2.20)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
@@ -54,15 +54,17 @@ GEM
     cookiejar (0.3.2)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    cucumber (1.3.17)
+    cucumber (2.0.0.beta.3)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.0.0.beta.3)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
+    cucumber-core (1.0.0.beta.3)
+      gherkin (~> 2.12.0)
     daemons (1.1.9)
     dante (0.2.0)
-    debugger-ruby_core_source (1.3.5)
     delorean (2.1.0)
       chronic
     diff-lcs (1.2.5)
@@ -119,10 +121,10 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.4.1)
+    mime-types (2.4.3)
     mini_portile (0.6.0)
     msgpack (0.5.9)
     multi_json (1.10.1)
@@ -132,7 +134,7 @@ GEM
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     numerizer (0.1.1)
-    oj (2.10.3)
+    oj (2.11.0)
     pact (1.3.3)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
@@ -143,7 +145,6 @@ GEM
       term-ansicolor (~> 1.0)
       thor
       webrick
-    perftools.rb (2.0.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -218,7 +219,7 @@ GEM
     tins (1.3.3)
     trollop (2.0)
     tzinfo (1.0.1)
-    tzinfo-data (1.2014.8)
+    tzinfo-data (1.2014.9)
       tzinfo (>= 1.0.0)
     vegas (0.1.11)
       rack (>= 1.0.0)
@@ -232,8 +233,7 @@ PLATFORMS
 
 DEPENDENCIES
   async_rack_test (>= 0.0.5)
-  cucumber
-  debugger-ruby_core_source (>= 1.3.4)
+  cucumber (>= 2.0.0.beta.3)
   delorean
   flapjack!
   fuubar
@@ -241,7 +241,6 @@ DEPENDENCIES
   guard-cucumber
   guard-rspec
   pact
-  perftools.rb
   rack-test
   rb-fsevent
   resque_spec

data/features/steps/notifications_steps.rb

@@ -2,16 +2,16 @@
 # copied from flapjack-populator
 # TODO use Flapjack::Data::Contact.add
 def add_contact(contact = {})
-  @redis.multi
-  @redis.del("contact:#{contact['id']}")
-  @redis.del("contact_media:#{contact['id']}")
-  @redis.hset("contact:#{contact['id']}", 'first_name', contact['first_name'])
-  @redis.hset("contact:#{contact['id']}", 'last_name',  contact['last_name'])
-  @redis.hset("contact:#{contact['id']}", 'email',      contact['email'])
-  contact['media'].each_pair {|medium, address|
-    @redis.hset("contact_media:#{contact['id']}", medium, address)
-  }
-  @redis.exec
+  @redis.multi do |multi|
+    multi.del("contact:#{contact['id']}")
+    multi.del("contact_media:#{contact['id']}")
+    multi.hset("contact:#{contact['id']}", 'first_name', contact['first_name'])
+    multi.hset("contact:#{contact['id']}", 'last_name',  contact['last_name'])
+    multi.hset("contact:#{contact['id']}", 'email',      contact['email'])
+    contact['media'].each_pair {|medium, address|
+      multi.hset("contact_media:#{contact['id']}", medium, address)
+    }
+  end
 end
 
 Given /^the user wants to receive SMS notifications for entity '([\w\.\-]+)'$/ do |entity|

data/features/support/env.rb

@@ -115,16 +115,13 @@ end
 
 config = Flapjack::Configuration.new
 redis_opts = config.load(FLAPJACK_CONFIG) ?
-             config.for_redis :
+             config.for_redis.merge(:driver => :ruby) :
              {:db => 14, :driver => :ruby}
 redis = ::Redis.new(redis_opts)
 redis.flushdb
 RedisDelorean.before_all(:redis => redis)
 redis.quit
 
-# NB: this seems to execute outside the Before/After hooks
-# regardless of placement -- this is what we want, as the
-# @redis driver should be initialised in the sync block.
 Around do |scenario, blk|
   EM.synchrony do
     blk.call
@@ -140,7 +137,6 @@ After do
   @logger.messages = []
 end
 
-
 Before('@processor') do
   @processor = Flapjack::Processor.new(:logger => @logger,
     :redis_config => redis_opts, :config => {})
@@ -150,6 +146,7 @@ end
 After('@processor') do
   @redis.flushdb
   @redis.quit
+  @redis = nil
 end
 
 Before('@notifier') do
@@ -165,6 +162,7 @@ end
 After('@notifier') do
   @notifier_redis.flushdb
   @notifier_redis.quit
+  @notifier_redis = nil
 end
 
 Before('@resque') do
@@ -173,7 +171,7 @@ Before('@resque') do
 end
 
 Before('@time') do
-  RedisDelorean.before_each(:redis => @redis)
+  RedisDelorean.before_each(:redis => @redis || @notifier_redis)
 end
 
 After('@time') do

data/flapjack.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'dante'
   gem.add_dependency 'oj', '>= 2.9.0'
   gem.add_dependency 'eventmachine', '~> 1.0.0'
+  gem.add_dependency 'redis', '~> 3.0.6'
   gem.add_dependency 'hiredis'
   gem.add_dependency 'em-synchrony', '~> 1.0.2'
   gem.add_dependency 'em-http-request'
-  gem.add_dependency 'redis', '~> 3.0.6'
   gem.add_dependency 'em-resque'
   gem.add_dependency 'resque', '~> 1.23.0'
   gem.add_dependency 'sinatra'

data/lib/flapjack/data/entity.rb

@@ -44,12 +44,17 @@ module Flapjack
 
         check_history_keys = redis.keys("#{existing_name}:*:states") +
           redis.keys("#{existing_name}:*:state") +
-          redis.keys("#{existing_name}:*:summary") +
           redis.keys("#{existing_name}:*:sorted_state_timestamps")
 
         action_keys = redis.keys("#{existing_name}:*:actions")
 
-        maint_keys = redis.keys("#{existing_name}:*:*scheduled_maintenance*") +
+        maint_keys = redis.keys("#{existing_name}:*:*scheduled_maintenance*")
+
+        all_summary_keys = redis.keys("#{existing_name}:*:summary")
+        maint_summary_keys = redis.keys("#{existing_name}:*:*scheduled_maintenance:summary")
+        check_summary_keys = all_summary_keys - maint_summary_keys
+
+        check_history_keys += check_summary_keys
 
         notif_keys = redis.keys("#{existing_name}:*:last_*_notification") +
           redis.keys("#{existing_name}:*:*_notifications")
@@ -100,54 +105,61 @@ module Flapjack
 
         block_keys = redis.keys("drop_alerts_for_contact:*:*:#{existing_name}:*:*")
 
-        redis.multi
+        rename_all_checks = redis.exists("all_checks:#{existing_name}")
+        rename_current_checks = redis.exists("current_checks:#{existing_name}")
 
-        yield if block_given? # entity id -> name update from add()
+        redis.multi do |multi|
 
-        check_state_keys.each do |csk|
-          redis.rename(csk, csk.sub(/^check:#{Regexp.escape(existing_name)}:/, "check:#{entity_name}:"))
-        end
+          yield(multi) if block_given? # entity id -> name update from add()
 
-        (check_history_keys + action_keys + maint_keys + notif_keys).each do |chk|
-          redis.rename(chk, chk.sub(/^#{Regexp.escape(existing_name)}:/, "#{entity_name}:"))
-        end
+          check_state_keys.each do |csk|
+            multi.rename(csk, csk.sub(/^check:#{Regexp.escape(existing_name)}:/, "check:#{entity_name}:"))
+          end
 
-        all_checks.each_pair do |ch, score|
-          redis.zrem('all_checks', "#{existing_name}:#{ch}")
-          redis.zadd('all_checks', score, "#{entity_name}:#{ch}")
-        end
+          (check_history_keys + action_keys + maint_keys + notif_keys).each do |chk|
+            multi.rename(chk, chk.sub(/^#{Regexp.escape(existing_name)}:/, "#{entity_name}:"))
+          end
 
-        # currently failing checks
-        failed_checks.each_pair do |ch, score|
-          redis.zrem('failed_checks', "#{existing_name}:#{ch}")
-          redis.zadd('failed_checks', score, "#{entity_name}:#{ch}")
-        end
+          all_checks.each_pair do |ch, score|
+            multi.zrem('all_checks', "#{existing_name}:#{ch}")
+            multi.zadd('all_checks', score, "#{entity_name}:#{ch}")
+          end
 
-        redis.rename("all_checks:#{existing_name}", "all_checks:#{entity_name}")
-        redis.rename("current_checks:#{existing_name}", "current_checks:#{entity_name}")
+          # currently failing checks
+          failed_checks.each_pair do |ch, score|
+            multi.zrem('failed_checks', "#{existing_name}:#{ch}")
+            multi.zadd('failed_checks', score, "#{entity_name}:#{ch}")
+          end
 
-        unless current_score.nil?
-          redis.zrem('current_entities', existing_name)
-          redis.zadd('current_entities', current_score, entity_name)
-        end
+          if rename_all_checks
+            multi.rename("all_checks:#{existing_name}", "all_checks:#{entity_name}")
+          end
 
-        block_keys.each do |blk|
-          redis.rename(blk, blk.sub(/^drop_alerts_for_contact:(.+):([^:]+):#{Regexp.escape(existing_name)}:(.+):([^:]+)$/,
-            "drop_alerts_for_contact:\\1:\\2:#{entity_name}:\\3:\\4"))
-        end
+          if rename_current_checks
+            multi.rename("current_checks:#{existing_name}", "current_checks:#{entity_name}")
+          end
 
-        hashes_to_remove.each   {|hash|      redis.hdel('checks_by_hash', hash) }
-        hashes_to_add.each_pair {|hash, chk| redis.hset('checks_by_hash', hash, chk)}
+          unless current_score.nil?
+            multi.zrem('current_entities', existing_name)
+            multi.zadd('current_entities', current_score, entity_name)
+          end
 
-        alerting_to_remove.each_pair do |alerting, chks|
-          chks.each {|chk| redis.zrem(alerting, chk)}
-        end
+          block_keys.each do |blk|
+            multi.rename(blk, blk.sub(/^drop_alerts_for_contact:(.+):([^:]+):#{Regexp.escape(existing_name)}:(.+):([^:]+)$/,
+              "drop_alerts_for_contact:\\1:\\2:#{entity_name}:\\3:\\4"))
+          end
 
-        alerting_to_add.each_pair do |alerting, chks|
-          chks.each_pair {|chk, score| redis.zadd(alerting, score, chk)}
-        end
+          hashes_to_remove.each   {|hash|      multi.hdel('checks_by_hash', hash) }
+          hashes_to_add.each_pair {|hash, chk| multi.hset('checks_by_hash', hash, chk)}
+
+          alerting_to_remove.each_pair do |alerting, chks|
+            chks.each {|chk| multi.zrem(alerting, chk)}
+          end
 
-        redis.exec
+          alerting_to_add.each_pair do |alerting, chks|
+            chks.each_pair {|chk, score| multi.zadd(alerting, score, chk)}
+          end
+        end
       end
 
       # NB only used by the 'entities:reparent' Rake task, but kept in this
@@ -213,8 +225,12 @@ module Flapjack
             ch_fail_score = redis.zscore("failed_checks", old_check)
             failed_checks_to_add[current_check] = ch_fail_score unless ch_fail_score.nil?
 
-            keys_to_rename["check:#{old_check}"] = "check:#{current_check}"
-            keys_to_rename[old_states]           = new_states
+            if redis.exists("check:#{old_check}")
+              keys_to_rename["check:#{old_check}"] = "check:#{current_check}"
+            end
+            if redis.exists(old_states)
+              keys_to_rename[old_states] = new_states
+            end
           end
 
           notification_types.each do |notif|
@@ -229,7 +245,7 @@ module Flapjack
               end
 
               keys_to_delete << old_notif
-            else
+            elsif redis.exists(old_notif)
               keys_to_rename[old_notif] = new_notif
             end
           end
@@ -258,13 +274,13 @@ module Flapjack
 
         if redis.exists("all_checks:#{current_name}")
           keys_to_delete << "all_checks:#{old_name}"
-        else
+        elsif redis.exists("all_checks:#{old_name}")
           keys_to_rename["all_checks:#{old_name}"] = "all_checks:#{current_name}"
         end
 
         if redis.exists("current_checks:#{current_name}")
           keys_to_delete << "current_checks:#{old_name}"
-        else
+        elsif redis.exists("current_checks:#{old_name}")
           keys_to_rename["current_checks:#{old_name}"] = "current_checks:#{current_name}"
         end
 
@@ -291,7 +307,7 @@ module Flapjack
           if redis.exists(current_actions)
             action_data[current_actions] = redis.hgetall(old_actions)
             keys_to_delete << old_actions
-          else
+          elsif redis.exists(old_actions)
             keys_to_rename[old_actions] = current_actions
           end
         end
@@ -317,7 +333,7 @@ module Flapjack
           # TTL < 0 is a redis error code -- key not present, etc.
           if (old_ttl >= 0) && ((new_ttl < 0) ||
                ((old_time + old_ttl) > (new_time + new_ttl)))
-            keys_to_rename[maint_key] = new_maint_key
+            keys_to_rename[maint_key] = new_maint_key if redis.exists(maint_key)
             maints_to_set[new_maint_key] = redis.zscore("#{maint_key}s", old_time)
           end
 
@@ -350,84 +366,83 @@ module Flapjack
 
         notif_keys = redis.keys("#{old_name}:*:last_*_notification")
 
-        redis.multi
+        redis.multi do |multi|
 
-        check_history_keys.each do |chk|
-          redis.renamenx(chk, chk.sub(/^#{Regexp.escape(old_name)}:/, "#{current_name}:"))
-        end
-
-        check_timestamps_keys.each do |ctk|
-          dest = ctk.sub(/^#{Regexp.escape(old_name)}:/, "#{current_name}:")
-          redis.zunionstore(dest, [ctk, dest], :aggregate => :max)
-        end
+          check_history_keys.each do |chk|
+            multi.renamenx(chk, chk.sub(/^#{Regexp.escape(old_name)}:/, "#{current_name}:"))
+          end
 
-        all_checks_to_remove.each do |actr|
-          redis.zrem('all_checks', actr)
-        end
+          check_timestamps_keys.each do |ctk|
+            dest = ctk.sub(/^#{Regexp.escape(old_name)}:/, "#{current_name}:")
+            multi.zunionstore(dest, [ctk, dest], :aggregate => :max)
+          end
 
-        all_checks_to_add.each_pair do |acta, score|
-          redis.zadd('all_checks', score, acta)
-        end
+          all_checks_to_remove.each do |actr|
+            multi.zrem('all_checks', actr)
+          end
 
-        failed_checks_to_remove.each do |fctr|
-          redis.zrem('failed_checks', fctr)
-        end
+          all_checks_to_add.each_pair do |acta, score|
+            multi.zadd('all_checks', score, acta)
+          end
 
-        failed_checks_to_add.each_pair do |fcta, score|
-          redis.zadd('failed_checks', score, fcta)
-        end
+          failed_checks_to_remove.each do |fctr|
+            multi.zrem('failed_checks', fctr)
+          end
 
-        action_data.each_pair do |action_key, data|
-          data.each_pair do |k, v|
-            redis.hsetnx(action_key, k, v)
+          failed_checks_to_add.each_pair do |fcta, score|
+            multi.zadd('failed_checks', score, fcta)
           end
-        end
 
-        redis.zunionstore("current_checks:#{current_name}",
-          ["current_checks:#{old_name}", "current_checks:#{current_name}"],
-          :aggregate => :max)
+          action_data.each_pair do |action_key, data|
+            data.each_pair do |k, v|
+              multi.hsetnx(action_key, k, v)
+            end
+          end
 
-        redis.zrem('current_entities', old_name)
-        unless old_score.nil?
-          redis.zadd('current_entities', old_score, current_name)
-        end
+          multi.zunionstore("current_checks:#{current_name}",
+            ["current_checks:#{old_name}", "current_checks:#{current_name}"],
+            :aggregate => :max)
 
-        maints_to_set.each_pair do |maint_key, score|
-          redis.zadd("#{maint_key}s", score, current_name)
-        end
+          multi.zrem('current_entities', old_name)
+          unless old_score.nil?
+            multi.zadd('current_entities', old_score, current_name)
+          end
 
-        stored_maint_keys.each do |stored_maint_key|
-          new_stored_maint_key = stored_maint_key.sub(/^#{Regexp.escape(old_name)}:/, "#{current_name}:")
-          redis.zunionstore(new_stored_maint_key,
-            [stored_maint_key, new_stored_maint_key],
-            :aggregate => :max)
-        end
+          maints_to_set.each_pair do |maint_key, score|
+            multi.zadd("#{maint_key}s", score, current_name)
+          end
 
-        notif_keys.each do |nk|
-          dest = nk.sub(/^#{Regexp.escape(old_name)}:/, "#{current_name}:")
-          redis.renamenx(nk, dest)
-          redis.del(nk)
-        end
+          stored_maint_keys.each do |stored_maint_key|
+            new_stored_maint_key = stored_maint_key.sub(/^#{Regexp.escape(old_name)}:/, "#{current_name}:")
+            multi.zunionstore(new_stored_maint_key,
+              [stored_maint_key, new_stored_maint_key],
+              :aggregate => :max)
+          end
 
-        alerting_to_remove.each_pair do |alerting, chks|
-          chks.each {|chk| redis.zrem(alerting, chk)}
-        end
+          notif_keys.each do |nk|
+            dest = nk.sub(/^#{Regexp.escape(old_name)}:/, "#{current_name}:")
+            multi.renamenx(nk, dest)
+            multi.del(nk)
+          end
 
-        alerting_to_add.each_pair do |alerting, chks|
-          chks.each_pair {|chk, score| redis.zadd(alerting, score, chk)}
-        end
+          alerting_to_remove.each_pair do |alerting, chks|
+            chks.each {|chk| multi.zrem(alerting, chk)}
+          end
 
-        blocks_to_set.each_pair do |block_key, (timestamp, value)|
-          redis.setex(block_key, (timestamp - Time.now.to_i), value)
-        end
+          alerting_to_add.each_pair do |alerting, chks|
+            chks.each_pair {|chk, score| multi.zadd(alerting, score, chk)}
+          end
 
-        keys_to_rename.each_pair do |old_key, new_key|
-          redis.rename(old_key, new_key)
-        end
+          blocks_to_set.each_pair do |block_key, (timestamp, value)|
+            multi.setex(block_key, (timestamp - Time.now.to_i), value)
+          end
 
-        redis.del(*keys_to_delete) unless keys_to_delete.empty?
+          keys_to_rename.each_pair do |old_key, new_key|
+            multi.rename(old_key, new_key)
+          end
 
-        redis.exec
+          multi.del(*keys_to_delete) unless keys_to_delete.empty?
+        end
       end
 
       # NB: If entities are renamed in imported data before they are
@@ -467,10 +482,10 @@ module Flapjack
             if redis.hexists('all_entity_ids_by_name', entity_name)
               merge(existing_name, entity_name, :redis => redis)
             else
-              rename(existing_name, entity_name, :redis => redis) {
-                redis.hdel('all_entity_ids_by_name', existing_name)
-                redis.hset('all_entity_ids_by_name', entity_name, entity_id)
-                redis.hset('all_entity_names_by_id', entity_id, entity_name)
+              rename(existing_name, entity_name, :redis => redis) {|multi|
+                multi.hdel('all_entity_ids_by_name', existing_name)
+                multi.hset('all_entity_ids_by_name', entity_name, entity_id)
+                multi.hset('all_entity_names_by_id', entity_id, entity_name)
               }
             end
           end