infopark-politics 0.2.8 → 0.2.9

data/lib/politics/static_queue_worker.rb

@@ -74,8 +74,8 @@ module Politics
 
       self.group_name = name
       self.iteration_length = options[:iteration_length]
-      @nominated_at = Time.now - self.iteration_length
       @memcache_client = client_for(Array(options[:servers]))
+      @nominated_at = Time.now
       # FIXME: Tests
       @domain = options[:domain]
 
@@ -96,6 +96,11 @@ module Politics
       raise ArgumentError, "You must call register_worker before processing!" unless @memcache_client
 
       begin
+        begin
+          raise "self is not alive via drb" unless DRbObject.new(nil, uri).alive?
+        rescue Exception => e
+          raise "cannot reach self via drb: #{e.message}"
+        end
         begin
           nominate
           if leader?
@@ -149,6 +154,10 @@ module Politics
       left > 0 ? left : 0
     end
 
+    def alive?
+      true
+    end
+
     private
 
     def bucket_process(bucket, sleep_time)
@@ -182,25 +191,7 @@ module Politics
     end
 
     def leader
-      log.debug "trying to get the leader (#{leader_uri})"
-      name = leader_uri
-      repl = nil
-      log.debug "replicas: #{replicas}"
-      loops = 0
-      while loops < 10 and (replicas.empty? or repl == nil)
-        repl = replicas.detect { |replica| replica.__drburi == name }
-        log.debug "repl: #{repl && repl.__drburi}"
-        unless repl
-          log.debug "scan bonjour for other nodes (replicas)"
-          relax 1
-          bonjour_scan do |replica|
-            log.debug "found replica #{replica.__drburi}"
-            replicas << replica
-          end
-        end
-        loops += 1
-      end
-      repl || raise(DRb::DRbError.new("Could not contact leader #{leader_uri}"))
+      DRbObject.new(nil, leader_uri)
     end
 
     def loop?
@@ -234,8 +225,8 @@ module Politics
     # and attempting to add the token with our name attached.
     def nominate
       log.debug("try to nominate")
-      @memcache_client.add(token, @uri, iteration_length)
       @nominated_at = Time.now
+      @memcache_client.add(token, @uri, iteration_length)
       @leader_uri = nil
     end
 
@@ -283,17 +274,6 @@ module Politics
       # }
     end
 
-    def bonjour_scan
-      Net::DNS::MDNSSD.browse("_#{group_name}._tcp") do |b|
-        Net::DNS::MDNSSD.resolve(b.name, b.type, b.domain) do |r|
-          yield DRbObject.new(nil, "druby://#{r.target}:#{r.port}")
-          unless !@domain || r.target =~ /\.#{@domain}$/
-            yield DRbObject.new(nil, "druby://#{r.target}.#{@domain}:#{r.port}")
-          end
-        end
-      end
-    end
-
     # http://coderrr.wordpress.com/2008/05/28/get-your-local-ip-address/
     def local_ip
       orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true # turn off reverse DNS resolution temporarily
@@ -305,6 +285,5 @@ module Politics
     ensure
       Socket.do_not_reverse_lookup = orig
     end
-
   end
 end

data/spec/static_queue_worker_spec.rb

@@ -27,47 +27,66 @@ describe Worker do
     @worker.until_next_iteration
   end
 
-  it "should return zero for 'until_next_iteration' if nominate was not completed" do
-    @worker.until_next_iteration.should == 0
+  it "should return time to next iteration even if nominate was not completed" do
+    @worker.until_next_iteration.should > 0
+    @worker.until_next_iteration.should <= 10
   end
 
   it "should give access to the uri" do
     @worker.uri.should =~ %r(^druby://)
   end
 
+  it "should be alive" do
+    @worker.should be_alive
+  end
+
   describe Worker, "when processing bucket" do
     before do
-      @worker.stub!(:until_next_iteration).and_return 666
-      @worker.stub!(:nominate)
-      @worker.should_receive(:loop?).and_return true, true, true, false
+      DRbObject.stub!(:new).with(nil, @worker.uri).
+          and_return(@worker_drb = mock('drb', :alive? => true))
     end
 
-    it "should relax until next iteration on MemCache errors during nomination" do
-      @worker.should_receive(:nominate).at_least(1).and_raise MemCache::MemCacheError.new("Buh!")
-      @worker.should_receive(:relax).with(666).exactly(4).times
-
-      @worker.start
+    it "should raise an error if it is not alive via Drb" do
+      @worker_drb.stub!(:alive?).and_raise("drb error")
+      lambda {@worker.start}.should raise_error(/cannot reach self/)
+      @worker_drb.stub!(:alive?).and_return(false)
+      lambda {@worker.start}.should raise_error(/not alive/)
     end
 
-    it "should relax until next iteration on MemCache errors during request for leader" do
-      @worker.should_receive(:leader_uri).at_least(1).and_raise(MemCache::MemCacheError.new("Buh!"))
-      @worker.should_receive(:relax).with(666).exactly(4).times
+    describe "" do
+      before do
+        @worker.stub!(:until_next_iteration).and_return 666
+        @worker.stub!(:nominate)
+        @worker.should_receive(:loop?).and_return true, true, true, false
+      end
 
-      @worker.start
-    end
+      it "should relax until next iteration on MemCache errors during nomination" do
+        @worker.should_receive(:nominate).exactly(4).and_raise MemCache::MemCacheError.new("Buh!")
+        @worker.should_receive(:relax).with(666).exactly(4).times
 
-    describe "as follower" do
-      before do
-        @worker.stub!(:leader?).and_return false
-        @worker.stub!(:leader_uri).and_return "the leader"
+        @worker.start
       end
 
-      it "should get the bucket to process from the leader at every iteration" do
-        @worker.stub!(:uri).and_return("my uri")
-        @worker.should_receive(:leader).exactly(4).times.and_return(leader = mock('leader'))
-        leader.should_receive(:bucket_request).with("my uri").exactly(4).times.and_return([1, 2])
+      it "should relax until next iteration on MemCache errors during request for leader" do
+        @worker.should_receive(:leader_uri).exactly(4).and_raise(MemCache::MemCacheError.new("Buh"))
+        @worker.should_receive(:relax).with(666).exactly(4).times
+
         @worker.start
       end
+
+      describe "as follower" do
+        before do
+          @worker.stub!(:leader?).and_return false
+          @worker.stub!(:leader_uri).and_return "the leader"
+        end
+
+        it "should get the bucket to process from the leader at every iteration" do
+          @worker.should_receive(:leader).exactly(4).times.and_return(leader = mock('leader'))
+          leader.should_receive(:bucket_request).with(@worker.uri).exactly(4).times.
+              and_return([1, 2])
+          @worker.start
+        end
+      end
     end
   end
 

metadata

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