test / test (push) Canceled after 0s
C-P42. postfix-script's start-fg runs master as its child and master calls setsid() (Postfix 3.7.11, conf/postfix-script; src/master/master.c); supervisord signals the pid alone (supervisor 4.2.5, process.py, Subprocess.kill()). A stop of program postfix left master running - a restart then found "already running" - and a container stop cut Postfix off with SIGKILL. The wrapper now stays the parent of "postfix start-fg" and on TERM/INT runs "postfix stop", asking again while start-fg is still in its checks (master -t). stopwaitsecs=15. C-V6. The wrapper's give-up on the milter sockets came after the default startsecs, so it was EXITED and restarted for ever. startsecs is now MILTER_WAIT_TIMEOUT + 10, exported by the entrypoint as POSTFIX_STARTSECS and expanded by supervisord (options.py, processes_from_section(); a non-number MILTER_WAIT_TIMEOUT stops the start): a give-up is "Exited too quickly", BACKOFF, FATAL after startretries, crashexit. For those seconds after each start the program is STARTING (the healthcheck's 90 s start period covers it; the sender check counts no downtime then). C-V5. logrotate had startsecs=0, so a refused config restarted it every second for ever. startsecs=1: FATAL after startretries; crashexit reads the event's processname and leaves logrotate's FATAL on Server > Health. B-U2. "supervisorctl start" returns when a startsecs=0 program is RUNNING, not when it ends, and mapped "already started" to success. The panel now speaks supervisord's XML-RPC itself (internal/supervisor, RunOnce): startProcess without waiting, getProcessInfo until it leaves STARTING/RUNNING, exitstatus 0 or an error; a run in progress is waited out and one of its own follows. A failed reload while program postfix is not RUNNING is logged, not an error: the next master reads the files. C-V10: postfix-reload rests EXITED after a run; the e2e process check takes STOPPED or EXITED. C-P34: the dead "postfix set-permissions" branch goes - postfix check's create-missing builds the queue tree. Stand (2026-10-14, make e2e, exit 0; MILTER_WAIT_TIMEOUT=10 on the stand): new supervision_stops_postfix_and_gives_up - supervisorctl restart postfix writes postfix-script's "stopping the Postfix mail system" and leaves one master; with the panel's sockets removed, start answers "postfix: ERROR (spawn error)" (finish() sets spawnerr "Exited too quickly", onwait() reads it first) and Postfix comes up once the panel is back; a group-writable logrotate config ends FATAL with the container up; the panel's Reload configuration answers only after mail.log has "refreshing the Postfix mail system", postfix-reload EXITED. session_survives_restart sees the stop line for the container's restart. Measured: master's own "terminating on signal 15" never reaches mail.log (master TERMs its group, postlogd included, before it logs). go vet and go test ./... pass on the server (24 packages; new unit tests of RunOnce against a fake supervisord). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
86 lines
3.3 KiB
Go
86 lines
3.3 KiB
Go
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// wantRunning are the supervisord programs that must be RUNNING once the
|
|
// container is up (build/supervisord.conf). postfix-reload is deliberately
|
|
// excluded: autostart=false, so it rests STOPPED until its first run and
|
|
// EXITED after it (supervisor 4.2.5, supervisor/process.py,
|
|
// Subprocess.finish(); assumptions C-V10).
|
|
var wantRunning = []string{"opendkim", "panel", "postfix", "cert-reload", "logrotate"}
|
|
|
|
// checkSupervisorProcesses shells into the container directly (not through the
|
|
// panel's /overview page) so it works before an administrator account even
|
|
// exists — this is the first thing the harness checks after `docker compose
|
|
// up` (plan C.4). Programs take a moment to leave STARTING right after the
|
|
// container starts - postfix its startsecs, MILTER_WAIT_TIMEOUT plus ten
|
|
// seconds, 20 on this stand - so this polls rather than checking once.
|
|
func checkSupervisorProcesses(s *stack) error {
|
|
var lastErr error
|
|
err := waitFor("all supervised programs to reach their steady state", 60*time.Second, 500*time.Millisecond, func() (bool, error) {
|
|
out, execErr := s.execIn("selfpost", "supervisorctl", "-c", "/etc/supervisor/supervisord.conf", "status")
|
|
// supervisorctl exits non-zero when any program is not RUNNING, which
|
|
// is expected for postfix-reload — parse the output regardless of exit
|
|
// status.
|
|
states := parseSupervisorStatus(out)
|
|
if len(states) == 0 {
|
|
lastErr = fmt.Errorf("supervisorctl status produced nothing to parse: %v\n%s", execErr, out)
|
|
return false, lastErr
|
|
}
|
|
for _, name := range wantRunning {
|
|
state, ok := states[name]
|
|
if !ok {
|
|
lastErr = fmt.Errorf("program %q not reported by supervisorctl:\n%s", name, out)
|
|
return false, lastErr
|
|
}
|
|
if state != "RUNNING" {
|
|
lastErr = fmt.Errorf("program %q is %s, want RUNNING:\n%s", name, state, out)
|
|
return false, lastErr
|
|
}
|
|
}
|
|
if state, ok := states["postfix-reload"]; ok && state != "STOPPED" && state != "EXITED" {
|
|
lastErr = fmt.Errorf("program postfix-reload is %s, want STOPPED or EXITED (autostart=false):\n%s", state, out)
|
|
return false, lastErr
|
|
}
|
|
return true, nil
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("%w\n==== selfpost logs ====\n%s", err, s.logs("selfpost"))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func parseSupervisorStatus(out string) map[string]string {
|
|
states := make(map[string]string)
|
|
for _, line := range strings.Split(out, "\n") {
|
|
fields := strings.Fields(line)
|
|
if len(fields) < 2 {
|
|
continue
|
|
}
|
|
states[fields[0]] = fields[1]
|
|
}
|
|
return states
|
|
}
|
|
|
|
// checkInboundRelayOff asserts the default image does not accept mail on
|
|
// port 25: smtp/inet is absent from master.cf (Debian's stock listener is
|
|
// removed when INBOUND_RELAY_ENABLE is not true). For an absent service
|
|
// postconf -M prints nothing on stdout and "warning: unmatched request" on
|
|
// stderr (Postfix 3.7.11, src/postconf/postconf_master.c,
|
|
// pcf_show_master_entries()).
|
|
func checkInboundRelayOff(s *stack) error {
|
|
out, err := s.execIn("selfpost", "postconf", "-M", "smtp/inet")
|
|
combined := out
|
|
if err != nil {
|
|
combined += err.Error()
|
|
}
|
|
if strings.Contains(combined, "smtpd") && !strings.Contains(combined, "warning:") && !strings.Contains(combined, "fatal:") {
|
|
return fmt.Errorf("inbound smtp/inet is present while INBOUND_RELAY_ENABLE is off:\n%s", out)
|
|
}
|
|
return nil
|
|
}
|