yamine 0.10.3 → 0.10.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +27 -0
- data/lib/yamine/cli/boot.rb +76 -10
- data/lib/yamine/readiness.rb +60 -3
- data/lib/yamine/runner.rb +11 -4
- data/lib/yamine/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 073eb6f5386c8500d62348d2093ebc11fa13dc291f6907d11410bcb1b81e09eb
|
|
4
|
+
data.tar.gz: 9750f59d2dd9cce11832d232d3d1cb11248b31e52545133ab2b998d21bdf9549
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a0cb84ba9b5fccda18721eb0de3bbb05667cffe97caf8882a3d3217d8dbee339319af2c72090f3b5bee41df198b01cc345e2dcb0e74b8ca9af202f2cd688e7ee
|
|
7
|
+
data.tar.gz: 89f533e131495a41e6e1613e09017b5e3b4d3a834bbaa5507bf2d13bdcb16054fb9320f36585d9b858d4f34c96734b3a5285fe04a0a8e01fac8227689573dfb4
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,32 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [0.10.4] — 2026-09-11
|
|
4
|
+
|
|
5
|
+
### Fixed
|
|
6
|
+
|
|
7
|
+
- **A stale `tmp/pids/server.pid` no longer kills the boot 2s in.** The
|
|
8
|
+
anywaye incident: an interrupted earlier run left puma alive, Rails
|
|
9
|
+
refused to start ("A server is already running (pid: N)"), `web` died
|
|
10
|
+
before its first healthcheck, and the failure line only said "process
|
|
11
|
+
exited" — the actual reason sat in the log file. Now:
|
|
12
|
+
- Pre-flight `Readiness.server_pid_conflict` checks the pidfile BEFORE
|
|
13
|
+
spawning. A live holder is a conflict, not a mystery crash; a dead
|
|
14
|
+
pid is fine (Rails overwrites it).
|
|
15
|
+
- When the holder is this app's own leftover puma (`puma ... [app]`),
|
|
16
|
+
yamine reaps it automatically. Anything else fails with the exact
|
|
17
|
+
fix (`kill N && rm tmp/pids/server.pid`), or `--force` to take over.
|
|
18
|
+
- `Readiness.fatal_line` recognizes the common killers (already
|
|
19
|
+
running, address in use, missing gems, missing database) in the
|
|
20
|
+
process's own log and puts the real reason in the failure line.
|
|
21
|
+
- **No more orphans on any failure path.** The incident left puma +
|
|
22
|
+
solid-queue + ask-app-server running for 24 minutes with no routes
|
|
23
|
+
after the CLI exited. Now `Runner#boot_run` reaps the backend when
|
|
24
|
+
registration is refused (quota/conflict), `boot_concurrent` tracks
|
|
25
|
+
every spawned HTTP backend in `children` before adopt, and `boot_all`
|
|
26
|
+
wraps spawn+boot so a raise mid-boot kills every child and removes
|
|
27
|
+
every route already registered. Tests pin all three (with `expects`
|
|
28
|
+
so they cannot pass vacuously).
|
|
29
|
+
|
|
3
30
|
## [0.10.3] — 2026-09-11
|
|
4
31
|
|
|
5
32
|
### Added
|
data/lib/yamine/cli/boot.rb
CHANGED
|
@@ -90,6 +90,28 @@ module Yamine
|
|
|
90
90
|
exit 1
|
|
91
91
|
end
|
|
92
92
|
|
|
93
|
+
# Pre-flight: a live tmp/pids/server.pid makes Rails refuse to
|
|
94
|
+
# boot ("A server is already running") the moment web starts.
|
|
95
|
+
# When the holder is this app's own puma (`puma ... [app]`), take
|
|
96
|
+
# over automatically — that is one of ours. Anything else is not
|
|
97
|
+
# ours to kill: fail with the exact fix before spawning.
|
|
98
|
+
conflict_ok, conflict_detail, conflict_pid = Readiness.server_pid_conflict(Dir.pwd)
|
|
99
|
+
unless conflict_ok
|
|
100
|
+
if own_orphan_puma?(conflict_pid, resolved.app, Dir.pwd)
|
|
101
|
+
say opts, " reaping own orphaned server (pid #{conflict_pid})"
|
|
102
|
+
reap_stale_server(conflict_pid)
|
|
103
|
+
elsif opts[:force]
|
|
104
|
+
say opts, " --force: taking over pid #{conflict_pid}"
|
|
105
|
+
reap_stale_server(conflict_pid)
|
|
106
|
+
else
|
|
107
|
+
$stderr.puts "Error: #{conflict_detail}."
|
|
108
|
+
$stderr.puts " Rails will refuse to boot while it runs. Free it first:"
|
|
109
|
+
$stderr.puts " kill #{conflict_pid} && rm tmp/pids/server.pid"
|
|
110
|
+
$stderr.puts " Or re-run with --force to let yamine take over that pid."
|
|
111
|
+
exit 1
|
|
112
|
+
end
|
|
113
|
+
end
|
|
114
|
+
|
|
93
115
|
runner = Runner.new(store: ctx.store)
|
|
94
116
|
children = []
|
|
95
117
|
routes_registered = []
|
|
@@ -111,12 +133,21 @@ module Yamine
|
|
|
111
133
|
with_wait = !opts[:no_wait]
|
|
112
134
|
spawn_plan = collect_spawns(ctx, runner, resolved, opts, db_url, children)
|
|
113
135
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
136
|
+
begin
|
|
137
|
+
if with_wait
|
|
138
|
+
boot_concurrent(ctx, runner, resolved, opts, spawn_plan, children,
|
|
139
|
+
routes_registered, db_url, db_name, db_created, events: events)
|
|
140
|
+
else
|
|
141
|
+
boot_sequential(ctx, runner, resolved, opts, spawn_plan, children,
|
|
142
|
+
routes_registered, db_url, events: events)
|
|
143
|
+
end
|
|
144
|
+
rescue StandardError
|
|
145
|
+
# A raise mid-boot (route conflict, quota, unexpected error)
|
|
146
|
+
# must never leave half a tree running: reap every child and
|
|
147
|
+
# every route already registered, then surface the error.
|
|
148
|
+
children.each { |c| stop_spawned_pid(c[:pid]) }
|
|
149
|
+
cleanup_routes(ctx, routes_registered.flat_map { |r| r[:hostnames] })
|
|
150
|
+
raise
|
|
120
151
|
end
|
|
121
152
|
|
|
122
153
|
background = processes.select { |_, v| v["proxy"] == false }
|
|
@@ -137,6 +168,35 @@ module Yamine
|
|
|
137
168
|
supervise_tree(ctx, all_hostnames, named_pids, reporter: events)
|
|
138
169
|
end
|
|
139
170
|
|
|
171
|
+
# TERM the old server and make sure the pidfile no longer names
|
|
172
|
+
# a live process before we spawn (wait a moment; then remove the
|
|
173
|
+
# file if the process is still refusing to die, so Rails can boot
|
|
174
|
+
# over it — the socket it held is already ours to take).
|
|
175
|
+
def reap_stale_server(pid)
|
|
176
|
+
Process.kill("TERM", pid)
|
|
177
|
+
deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + 5
|
|
178
|
+
while Process.clock_gettime(Process::CLOCK_MONOTONIC) < deadline
|
|
179
|
+
break unless ProxyControl.pid_alive?(pid)
|
|
180
|
+
sleep 0.2
|
|
181
|
+
end
|
|
182
|
+
FileUtils.rm_f(File.join(Dir.pwd, "tmp", "pids", "server.pid"))
|
|
183
|
+
rescue SystemCallError
|
|
184
|
+
FileUtils.rm_f(File.join(Dir.pwd, "tmp", "pids", "server.pid"))
|
|
185
|
+
end
|
|
186
|
+
|
|
187
|
+
# Is this pid a leftover backend of THIS app? `puma (tcp://...)
|
|
188
|
+
# [app]` names the app; we also accept a command containing the
|
|
189
|
+
# app dir. Only then may we reap it unasked.
|
|
190
|
+
def own_orphan_puma?(pid, app, dir)
|
|
191
|
+
_out, status = Open3.capture2("ps", "-p", pid.to_s, "-o", "command=")
|
|
192
|
+
return false unless status.success?
|
|
193
|
+
|
|
194
|
+
cmd = _out.to_s
|
|
195
|
+
cmd.include?("[#{app}]") || cmd.include?(File.expand_path(dir))
|
|
196
|
+
rescue SystemCallError
|
|
197
|
+
false
|
|
198
|
+
end
|
|
199
|
+
|
|
140
200
|
# One pass over config: background processes spawn immediately
|
|
141
201
|
# (no route to wait on), HTTP processes become a spawn plan the
|
|
142
202
|
# boot mode executes. Compound-line refusal happens here so both
|
|
@@ -198,12 +258,18 @@ module Yamine
|
|
|
198
258
|
apps = {}
|
|
199
259
|
plan.each do |item|
|
|
200
260
|
say opts, " [#{item[:name]}] #{item[:url]}"
|
|
261
|
+
app = runner.spawn_http(name: item[:name], hostname: item[:hostname],
|
|
262
|
+
url: item[:url], dir: Dir.pwd, command: item[:command],
|
|
263
|
+
port: item[:port], rails_dev_host: item[:hostname],
|
|
264
|
+
database_url: db_url, force: opts[:force])
|
|
265
|
+
# Tracked before registration so any later failure (a raise
|
|
266
|
+
# during adopt, a crash while another process waits) can
|
|
267
|
+
# always reap it. Duplicate names in named_pids are harmless.
|
|
268
|
+
children << { name: item[:name], pid: app.pid }
|
|
201
269
|
apps[item[:name]] = {
|
|
202
270
|
item: item,
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
port: item[:port], rails_dev_host: item[:hostname],
|
|
206
|
-
database_url: db_url, force: opts[:force])
|
|
271
|
+
log_path: File.join(Dir.pwd, "log", "yamine-#{item[:name]}.log"),
|
|
272
|
+
app: app
|
|
207
273
|
}
|
|
208
274
|
end
|
|
209
275
|
wait_result = Readiness.wait_all(apps, sink: events)
|
data/lib/yamine/readiness.rb
CHANGED
|
@@ -168,8 +168,7 @@ module Yamine
|
|
|
168
168
|
until Process.clock_gettime(Process::CLOCK_MONOTONIC) > deadline
|
|
169
169
|
unless process_alive?(app.pid)
|
|
170
170
|
ms = elapsed_ms(started)
|
|
171
|
-
return fail_result(name, started, ms,
|
|
172
|
-
"process exited before becoming healthy — see log/yamine-#{name}.log", sink)
|
|
171
|
+
return fail_result(name, started, ms, died_detail(name, slot), sink)
|
|
173
172
|
end
|
|
174
173
|
ok, detail = probe(item[:hostname], item[:port], path: path)
|
|
175
174
|
if ok
|
|
@@ -182,13 +181,24 @@ module Yamine
|
|
|
182
181
|
ms = elapsed_ms(started)
|
|
183
182
|
status = process_alive?(app.pid) ? "timeout" : "fail"
|
|
184
183
|
detail = process_alive?(app.pid) ? "no healthy response within #{timeout}s (#{last_error})" :
|
|
185
|
-
|
|
184
|
+
died_detail(name, slot)
|
|
186
185
|
event = Event.new(phase: "process", action: name, status: status,
|
|
187
186
|
duration_ms: ms, detail: detail)
|
|
188
187
|
sink&.event(event)
|
|
189
188
|
{ name: name, status: status, phase: "process", detail: detail, duration_ms: ms }
|
|
190
189
|
end
|
|
191
190
|
|
|
191
|
+
# Why a process that died before answering died: the recognized
|
|
192
|
+
# fatal line when there is one, else point at its log.
|
|
193
|
+
def died_detail(name, slot)
|
|
194
|
+
reason = fatal_line(slot[:log_path])
|
|
195
|
+
if reason
|
|
196
|
+
"process exited: #{reason} (log/yamine-#{name}.log)"
|
|
197
|
+
else
|
|
198
|
+
"process exited before becoming healthy — see log/yamine-#{name}.log"
|
|
199
|
+
end
|
|
200
|
+
end
|
|
201
|
+
|
|
192
202
|
def ok_result(name, started, ms, path, sink)
|
|
193
203
|
detail = path ? "healthcheck #{path} returned 2xx-3xx" : "port accepted connection"
|
|
194
204
|
event = Event.new(phase: "process", action: name, status: "ok",
|
|
@@ -204,6 +214,53 @@ module Yamine
|
|
|
204
214
|
{ name: name, status: "fail", phase: "process", detail: detail, duration_ms: ms }
|
|
205
215
|
end
|
|
206
216
|
|
|
217
|
+
# Rails refuses to boot when tmp/pids/server.pid names a live
|
|
218
|
+
# process ("A server is already running (pid: N)") — the classic
|
|
219
|
+
# interrupted-run leftover. Report the exact reason and the fix
|
|
220
|
+
# BEFORE spawning anything, instead of letting `web` die 2s later.
|
|
221
|
+
# Returns [ok, detail, pid]; ok is true when there is nothing in the
|
|
222
|
+
# way (no file, unreadable, or a dead pid — Rails overwrites those).
|
|
223
|
+
def server_pid_conflict(dir = Dir.pwd)
|
|
224
|
+
path = File.join(dir, "tmp", "pids", "server.pid")
|
|
225
|
+
return [true, nil, nil] unless File.file?(path)
|
|
226
|
+
|
|
227
|
+
pid = File.read(path).strip.to_i
|
|
228
|
+
return [true, nil, nil] unless pid.positive? && process_alive?(pid)
|
|
229
|
+
|
|
230
|
+
[false, "a Rails server is already running (pid #{pid}, from #{path})", pid]
|
|
231
|
+
rescue SystemCallError, ArgumentError
|
|
232
|
+
[true, nil, nil]
|
|
233
|
+
end
|
|
234
|
+
|
|
235
|
+
# Known fatal patterns in a dying backend's log. The log line that
|
|
236
|
+
# killed the process is more useful than "process exited" — agents
|
|
237
|
+
# should not have to open the file to learn why.
|
|
238
|
+
FATAL_PATTERNS = [
|
|
239
|
+
[/A server is already running \(pid:\s*(\d+)/i,
|
|
240
|
+
->(m) { "another server is already running (pid #{m[1]}); stale tmp/pids/server.pid" }],
|
|
241
|
+
[/Address already in use/i,
|
|
242
|
+
->(_m) { "address already in use; another process holds the port" }],
|
|
243
|
+
[/Bundler::GemNotFound|Could not find .* locally installed gems|run `?bundle install/i,
|
|
244
|
+
->(_m) { "gems missing; run `bundle install`" }],
|
|
245
|
+
[/ActiveRecord::NoDatabaseError|PG::ConnectionBad|database .* does not exist/i,
|
|
246
|
+
->(_m) { "database unreachable or missing; check DATABASE_URL / the database server" }]
|
|
247
|
+
].freeze
|
|
248
|
+
|
|
249
|
+
def fatal_line(path)
|
|
250
|
+
return nil unless path && File.file?(path)
|
|
251
|
+
|
|
252
|
+
lines = File.readlines(path).last(80)
|
|
253
|
+
FATAL_PATTERNS.each do |pattern, describe|
|
|
254
|
+
match = lines.reverse.find { |l| l.match?(pattern) }
|
|
255
|
+
next unless match
|
|
256
|
+
|
|
257
|
+
return describe.call(match.match(pattern))
|
|
258
|
+
end
|
|
259
|
+
nil
|
|
260
|
+
rescue SystemCallError
|
|
261
|
+
nil
|
|
262
|
+
end
|
|
263
|
+
|
|
207
264
|
def process_alive?(pid)
|
|
208
265
|
Process.kill(0, pid)
|
|
209
266
|
true
|
data/lib/yamine/runner.rb
CHANGED
|
@@ -103,10 +103,17 @@ module Yamine
|
|
|
103
103
|
Process.detach(pid)
|
|
104
104
|
target = "127.0.0.1:#{port}"
|
|
105
105
|
if register
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
106
|
+
begin
|
|
107
|
+
spec ||= { "dir" => File.expand_path(dir), "proc" => name }
|
|
108
|
+
@store.add_route(hostname, target, Process.pid, kind: "tcp",
|
|
109
|
+
force: force, spec: spec)
|
|
110
|
+
write_backend_pid(hostname, pid)
|
|
111
|
+
rescue StandardError
|
|
112
|
+
# Registration refused (quota, conflict): the backend is
|
|
113
|
+
# already spawned — never leave it running without a route.
|
|
114
|
+
stop_pid(pid)
|
|
115
|
+
raise
|
|
116
|
+
end
|
|
110
117
|
end
|
|
111
118
|
App.new(name: name, hostname: hostname, url: url, pid: pid,
|
|
112
119
|
target: target, kind: "tcp", command: command)
|
data/lib/yamine/version.rb
CHANGED