Changeset 279

Show
Ignore:
Timestamp:
05/10/07 16:23:04 (2 years ago)
Author:
derat
Message:

play with worker timeouts a bit

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/api/ruby/lib/gearman/worker.rb

    r278 r279  
    323323      end 
    324324 
    325       Util.log "Sending pre_sleep and going to sleep for #{2 * @reconnect_sec} sec" 
     325      Util.log "Sending pre_sleep and going to sleep for #{@reconnect_sec} sec" 
    326326      @servers_mutex.synchronize do 
    327327        @sockets.values.each do |sock| 
    …… 
    333333      # sending the first grab_job to one of the servers that had a socket 
    334334      # with data in it.  Not bothering with it for now. 
    335       IO::select(@sockets.values, nil, nil, 2 * @reconnect_sec) 
     335      IO::select(@sockets.values, nil, nil, @reconnect_sec) 
    336336    end 
    337337  end 

  • trunk/api/ruby/test/mock_client.rb

    r273 r279  
    2222    c.exec { client = Gearman::Client.new("localhost:#{server.port}") } 
    2323 
    24     c.exec { task1 = Gearman::Task.new('add', '5 + 2') } 
     24    c.exec { task1 = Gearman::Task.new('add', '5 2') } 
    2525    c.exec { task1.on_complete {|d| res1 = d.to_i } } 
    2626    c.exec { taskset = Gearman::TaskSet.new(client) } 
    …… 
    2929    s.wait 
    3030 
    31     s.exec { server.expect_request(sock, :submit_job, "add\000\0005 + 2") } 
     31    s.exec { server.expect_request(sock, :submit_job, "add\000\0005 2") } 
    3232    s.exec { server.send_response(sock, :job_created, "a") } 
    3333 
    3434    # Create a second task.  It should use the same socket as the first. 
    35     c.exec { task2 = Gearman::Task.new('add', '10 + 5') } 
     35    c.exec { task2 = Gearman::Task.new('add', '10 5') } 
    3636    c.exec { task2.on_complete {|d| res2 = d.to_i } } 
    3737    c.exec { taskset.add_task(task2) } 
    …… 
    4040    # second. 
    4141    s.exec { server.send_response(sock, :work_complete, "a\0007") } 
    42     s.exec { server.expect_request(sock, :submit_job, "add\000\00010 + 5") } 
     42    s.exec { server.expect_request(sock, :submit_job, "add\000\00010 5") } 
    4343    s.exec { server.send_response(sock, :job_created, "b") } 
    4444 

  • trunk/api/ruby/test/mock_worker.rb

    r278 r279  
    176176      worker = Gearman::Worker.new("localhost:#{server.port}", nil, 
    177177        { :client_id => 'test', 
    178           :reconnect_sec => 0.1, 
     178          :reconnect_sec => 0.15, 
    179179          :network_timeout_sec => 0.1 }) 
    180180    } 
    …… 
    186186    s.exec { server.expect_request(sock, :can_do, 'foo') } 
    187187 
    188     w.exec { worker.work } 
    189     s.exec { server.expect_request(sock, :grab_job) } 
    190     s.exec { sleep 0.11 } 
    191     s.wait 
    192  
     188    # Don't do anything after the client asks for a job. 
     189    w.exec { worker.work } 
     190    s.exec { server.expect_request(sock, :grab_job) } 
     191    s.exec { sleep 0.16 } 
     192    s.wait 
     193 
     194    # The client should reconnect and ask for a job again. 
    193195    s.exec { sock = server.expect_connection } 
    194196    s.wait 
     197 
    195198    s.exec { server.expect_request(sock, :set_client_id, 'test') } 
    196199    s.exec { server.expect_request(sock, :can_do, 'foo') } 
    197200    s.exec { server.expect_request(sock, :grab_job) } 
    198     s.wait 
     201    s.exec { server.send_response(sock, :job_assign, "a\0foo\0") } 
     202    s.exec { server.expect_request(sock, :work_complete, "a\0bar") } 
     203    s.wait 
     204    w.wait 
    199205  end 
    200206end