infopark-politics 0.2.12 → 0.2.13

data/lib/politics/static_queue_worker.rb

@@ -174,6 +174,16 @@ module Politics
       true
     end
 
+    def leader
+      2.times do
+        break if leader_uri
+        log.debug "could not determine leader - relaxing until next iteration"
+        relax until_next_iteration
+      end
+      raise "cannot determine leader" unless leader_uri
+      DRbObject.new(nil, leader_uri)
+    end
+
     private
 
     def bucket_process(bucket, sleep_time)
@@ -205,14 +215,6 @@ module Politics
     def update_buckets
     end
 
-    def replicas
-      @replicas ||= []
-    end
-
-    def leader
-      DRbObject.new(nil, leader_uri)
-    end
-
     def loop?
       true
     end
@@ -270,7 +272,6 @@ module Politics
       Time.now - a
     end
 
-
     def register_with_bonjour
       server = DRb.start_service(nil, self)
       @uri = DRb.uri

data/spec/static_queue_worker_spec.rb

@@ -22,6 +22,10 @@ class Worker
   def client_for(servers)
     @@memcache_client
   end
+
+  def local_ip
+    IPAddr.new("127.0.0.1")
+  end
 end
 
 describe Worker do
@@ -252,4 +256,39 @@ describe Worker do
       @worker.sleep_until_next_bucket_time.should == 5
     end
   end
+
+  describe "when providing leader object" do
+    before do
+      @worker.stub!(:until_next_iteration).and_return 0
+    end
+
+    it "should return a drb object with the leader uri" do
+      @worker.stub!(:leader_uri).and_return("leader's uri")
+      DRbObject.should_receive(:new).with(nil, "leader's uri").and_return "leader"
+      @worker.leader.should == "leader"
+    end
+
+    it "should try three times to get the leader on anarchy (no leader)" do
+      @worker.should_receive(:leader_uri).at_least(3).times.and_return nil
+      begin
+        @worker.leader
+      rescue
+      end
+    end
+
+    it "should raise an error when leader cannot be determined during anarchy" do
+      @worker.stub!(:leader_uri).and_return nil
+      lambda {@worker.leader}.should raise_error(/cannot determine leader/)
+    end
+
+    it "should sleep until next iteration before retrying to get leader" do
+      @worker.stub!(:leader_uri).and_return nil
+      @worker.stub!(:until_next_iteration).and_return 666
+      @worker.should_receive(:relax).with(666).exactly(2).times
+      begin
+        @worker.leader
+      rescue
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark-politics
 version: !ruby/object:Gem::Version 
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors: 
 - Mike Perham
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-01 00:00:00 -07:00
+date: 2009-07-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency