From: Eric Wong <e@80x24.org>
To: Christos Trochalakis <yatiohi@ideopolis.gr>
Cc: Dmitry Smirnov <onlyjob@debian.org>,
Hleb Valoshka <375gnu@gmail.com>,
unicorn@packages.debian.org, unicorn-public@bogomips.org
Subject: [PATCH v2] emulate sd_listen_fds for systemd support
Date: Sun, 5 Jul 2015 00:27:39 +0000 [thread overview]
Message-ID: <20150705002739.GA20509@dcvr.yhbt.net> (raw)
In-Reply-To: <20150630084746.GA6022@luke.ws.skroutz.gr>
systemd socket emulation shares FDs across execve, just like
the built-in SIGUSR2 upgrade process in unicorn. Thus it is
easy to support inheriting sockets from systemd.
Tested-by: Christos Trochalakis <yatiohi@ideopolis.gr>
---
Christos Trochalakis <yatiohi@ideopolis.gr> wrote:
> On Sat, Jun 27, 2015 at 04:01:36AM +0000, Eric Wong wrote:
> >Unfortunately, testing this is tricky because FD=3
> >(SD_LISTEN_FDS_START) tends to be grabbed by (MRI) Ruby 1.9.3
> >and onwards for the internal self-pipe.
OK, that was a bogus note.
I forgot exec() in Ruby 1.9+ supports redirects natively.
Test included in updated patch.
> I have also tested it and works as expected. Also, hardcoding
> SD_LISTEN_FDS_START seems like the best option. I 'd like to see that
> applied to master.
Thanks. This will be in 5.0.0.pre2
lib/unicorn/http_server.rb | 16 +++++++++++++---
test/exec/test_exec.rb | 24 ++++++++++++++++++++++++
2 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index 297b9f9..0f97516 100644
--- a/lib/unicorn/http_server.rb
+++ b/lib/unicorn/http_server.rb
@@ -766,12 +766,22 @@ class Unicorn::HttpServer
def inherit_listeners!
# inherit sockets from parents, they need to be plain Socket objects
# before they become Kgio::UNIXServer or Kgio::TCPServer
- inherited = ENV['UNICORN_FD'].to_s.split(',').map do |fd|
- io = Socket.for_fd(fd.to_i)
+ inherited = ENV['UNICORN_FD'].to_s.split(',')
+
+ # emulate sd_listen_fds() for systemd
+ sd_pid, sd_fds = ENV.values_at('LISTEN_PID', 'LISTEN_FDS')
+ if sd_pid && sd_pid.to_i == $$
+ # 3 = SD_LISTEN_FDS_START
+ inherited.concat((3...(3 + sd_fds.to_i)).map { |fd| Socket.for_fd(fd) })
+ end
+ # to ease debugging, we will not unset LISTEN_PID and LISTEN_FDS
+
+ inherited.map! do |fd|
+ io = String === fd ? Socket.for_fd(fd.to_i) : fd
io.autoclose = false
io = server_cast(io)
set_server_sockopt(io, listener_opts[sock_name(io)])
- logger.info "inherited addr=#{sock_name(io)} fd=#{fd}"
+ logger.info "inherited addr=#{sock_name(io)} fd=#{io.fileno}"
io
end
diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb
index 6deb96b..af8de26 100644
--- a/test/exec/test_exec.rb
+++ b/test/exec/test_exec.rb
@@ -96,6 +96,30 @@ run lambda { |env|
end
end
+ def test_sd_listen_fds_emulation
+ File.open("config.ru", "wb") { |fp| fp.write(HI) }
+ sock = TCPServer.new(@addr, @port)
+ sock.setsockopt(:SOL_SOCKET, :SO_KEEPALIVE, 0)
+
+ pid = xfork do
+ redirect_test_io do
+ # pretend to be systemd
+ ENV['LISTEN_PID'] = "#$$"
+ ENV['LISTEN_FDS'] = '1'
+
+ # 3 = SD_LISTEN_FDS_START
+ exec($unicorn_bin, "-l", "#@addr:#@port", 3 => sock)
+ end
+ end
+ res = hit(["http://#{@addr}:#{@port}/"])
+ assert_equal [ "HI\n"], res
+ assert_shutdown(pid)
+ assert_equal 1, sock.getsockopt(:SOL_SOCKET, :SO_KEEPALIVE).int,
+ "unicorn should always set SO_KEEPALIVE on inherited sockets"
+ ensure
+ sock.close if sock
+ end
+
def test_working_directory_rel_path_config_file
other = Tempfile.new('unicorn.wd')
File.unlink(other.path)
--
EW
next prev parent reply other threads:[~2015-07-05 0:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <16714105.fRFKlev1fp@debstor>
[not found] ` <3137844.nsIDTWmvl4@debstor>
[not found] ` <CAAB-Kc=s-uSK83PcfDsybPRiYvTaLVxcu2x4eWDPaTf27AJ_XQ@mail.gmail.com>
[not found] ` <1810167.FXDESjsu8Z@debstor>
2015-06-24 23:26 ` unicorn: native systemd service Eric Wong
2015-06-25 23:43 ` Dmitry Smirnov
2015-06-25 23:49 ` Eric Wong
[not found] ` <20150625083118.GA22140@luke.ws.skroutz.gr>
2015-06-25 23:26 ` [DRE-maint] " Eric Wong
2015-06-26 11:41 ` Christos Trochalakis
2015-06-27 3:05 ` Eric Wong
2015-06-27 4:01 ` [RFC] emulate sd_listen_fds for systemd support Eric Wong
2015-06-30 8:47 ` Christos Trochalakis
2015-07-05 0:27 ` Eric Wong [this message]
2015-06-30 9:20 ` [DRE-maint] unicorn: native systemd service Christos Trochalakis
2015-06-30 17:30 ` Eric Wong
2015-07-08 13:08 ` Christos Trochalakis
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/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150705002739.GA20509@dcvr.yhbt.net \
--to=e@80x24.org \
--cc=375gnu@gmail.com \
--cc=onlyjob@debian.org \
--cc=unicorn-public@bogomips.org \
--cc=unicorn@packages.debian.org \
--cc=yatiohi@ideopolis.gr \
/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/unicorn.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).