beetle 0.3.0.rc.9 → 0.3.0.rc.10

data/RELEASE_NOTES.rdoc

@@ -2,6 +2,7 @@
 
 == Version 0.3.0
 
+* redis master file contents now correctly reflects the state of the running configuration server
 * allow accelerating master switch via POST to redis configuration server
 * embedded http server into the redis configuration server (port 8080)
 * fixed a problem with redis shutdown command

data/features/redis_auto_failover.feature

@@ -15,6 +15,7 @@ Feature: Redis auto failover
     And the retry timeout for the redis master check is reached
     Then a system notification for "redis-1" not being available should be sent
     And the role of redis server "redis-2" should be "master"
+    And the redis master file of the redis configuration server should contain "redis-2"
     And the redis master of "rc-client-1" should be "redis-2"
     And the redis master of "rc-client-2" should be "redis-2"
     And the redis master of the beetle handler should be "redis-2"

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -95,6 +95,12 @@ Then /^the redis master of "([^\"]*)" should be "([^\"]*)"$/ do |redis_configura
   assert master, "#{redis_name} is not master of #{redis_configuration_client_name}, master file content: #{server_info.inspect}"
 end
 
+Then /^the redis master file of the redis configuration server should contain "([^"]*)"$/ do |redis_name|  # " for emacs :(
+  master_file = TestDaemons::RedisConfigurationServer.redis_master_file
+  file_contents = File.read(master_file).chomp
+  assert_equal TestDaemons::Redis[redis_name].ip_with_port, file_contents
+end
+
 Then /^the redis master of "([^\"]*)" should be undefined$/ do |redis_configuration_client_name|
   master_file = redis_master_file(redis_configuration_client_name)
   empty = false

data/lib/beetle/redis_configuration_server.rb

@@ -279,6 +279,7 @@ module Beetle
         beetle.publish(:system_notification, {"message" => msg}.to_json)
 
         new_master.master!
+        write_redis_master_file(new_master.server)
         @current_master = new_master
       else
         msg = "Redis master could not be switched, no slave available to become new master, promoting old master"

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.0.rc.9"
+  VERSION = "0.3.0.rc.10"
 end

data/test/beetle/redis_configuration_server_test.rb

@@ -147,6 +147,7 @@ module Beetle
       new_master = stub(:master! => nil, :server => "jo:6379")
       @server.beetle.expects(:publish).with(:system_notification, anything)
       @server.expects(:determine_new_master).returns(new_master)
+      @server.expects(:write_redis_master_file).with(new_master.server)
       @server.send :switch_master
       assert_equal new_master, @server.current_master
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 15424055
+  hash: 15424049
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 9
-  version: 0.3.0.rc.9
+  - 10
+  version: 0.3.0.rc.10
 platform: ruby
 authors: 
 - Stefan Kaes