From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Cc: e@80x24.org, EW <e+fbsd@80x24.org>
Subject: [PATCH 1/2] test_server: avoid multiple workers for dead parent check
Date: Wed, 16 Jul 2014 19:57:19 +0000 [thread overview]
Message-ID: <1405540640-10669-2-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1405540640-10669-1-git-send-email-e@80x24.org>
From: EW <e+fbsd@80x24.org>
This test is less reliable when there are multiple workers as the
second worker may not be ready to detect a dead parent.
This is still a possible race if the master dies very quicklly
before a worker is fully setup.
---
test/test_server.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/test_server.rb b/test/test_server.rb
index bd38ce3..69babb3 100644
--- a/test/test_server.rb
+++ b/test/test_server.rb
@@ -302,7 +302,7 @@ class TestServer < Testcase
end
def test_mp_dead_parent
- pid, host, port = new_mp_server
+ pid, host, port = new_mp_server(1)
wpid = nil
run_client(host, port) do |res|
wpid ||= res.body.to_i
@@ -334,7 +334,7 @@ class TestServer < Testcase
c.close
end
- def new_mp_server(nr = 1)
+ def new_mp_server(nr = 2)
ru = @ru = tmpfile(%w(config .ru))
@ru.puts('a = $$.to_s')
@ru.puts('run lambda { |_| [ 200, {"Content-Length"=>a.size.to_s},[a]]}')
@@ -342,7 +342,7 @@ class TestServer < Testcase
cfg = Yahns::Config.new
host, port = @srv.addr[3], @srv.addr[1]
cfg.instance_eval do
- worker_processes 2
+ worker_processes nr
GTL.synchronize { app(:rack, ru.path) { listen "#{host}:#{port}" } }
logger(Logger.new(File.open(err.path, "a")))
end
--
EW
next prev parent reply other threads:[~2014-07-16 19:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-16 19:57 [PATCH 0/2] FreeBSD-related fixes (affects Linux users, too) Eric Wong
2014-07-16 19:57 ` Eric Wong [this message]
2014-07-16 19:57 ` [PATCH 2/2] wbuf: avoid corrupted large responses with zero-copy sendfile Eric Wong
2015-03-07 21:36 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/yahns/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405540640-10669-2-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=e+fbsd@80x24.org \
--cc=yahns-public@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/yahns.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).