mirror of
https://github.com/mulgadc/spinifex.git
synced 2026-10-19 10:52:04 +00:00
1afc7fa8aa
* fix: retry a recovery relaunch that lost a race with a starting dependency A guest drain-stopped by a coordinated cluster shutdown could be lost for good. The relaunch ran before JetStream was serving, the volume lease claim timed out, and the failure was recorded as permanent. The backoff this needed already existed. relaunchWithRetry retries five times, but only on ErrMountRetryable, and mountErrRetryable recognised exactly two viperblock state-load sentinels. A lease claim returning context deadline exceeded matched neither, so the mount was reported as permanently failed and the backoff never engaged once. - Classify a lease store that cannot answer as ErrLeaseStoreUnavailable, and include it in mountErrRetryable. A lease held by another node is deliberately excluded: that is an answer, not an outage. - Probe readiness rather than connectedness. checkViperblockReady tested natsConn.IsConnected(), which is true against a server whose JetStream is still starting; it now calls AccountInfo with a timeout. - Reconsider a latched failure. RetryRecoveryFailed relaunches instances parked in error by a dependency-unavailable reason, once the backing store is confirmed ready, for a bounded number of passes, then leaves them alone. Only mount-state and launch failures qualify; a failed reconnect or pre-relaunch hook can mean the guest itself needs looking at. Closes the e2e gap that made this feel covered. The node-failure tests stop the service units directly so guests keep running and recovery is a QMP re-attach to a live process. Nothing stopped a guest, so nothing relaunched one from a sealed volume against dependencies that were still starting. TestMultinodeClusterRestartResumesGuests does, including the wait for every spx process to exit that makes it a real restart rather than a stop that returned early. Beads mulga-v7kp4, mulga-kyb1d. * fix: stop every spx process by unit in the cluster-restart helper The first CI run of TestMultinodeClusterRestartResumesGuests failed at the process wait with "node1 still has 2 spx process(es)", and the same thing happened by hand on a prod node. Every service is the same binary, and the stop was driven from a hard-coded list. StopNode names seven units and omits spinifex-northstar and spinifex-qmp-collector, which is exactly the two survivors. The unit name now comes from the surviving process's cgroup, so the set that stops is whoever is still running the binary and the list cannot go stale when a service is added. StopNode itself is left alone: its list is deliberate for the hard outage it simulates, where the target's drain must not fire. Also marks recovery_retry_test.go as //test:in-package — the retry policy is unexported and the tests drive it through the seams restore_test.go uses. * fix: stop spinifex.target in the cluster-restart helper, not the units The second CI run reformed NATS to 2 peers of 3: node3's NATS was stopped and never started again. StopNode stops the service units directly and leaves spinifex.target active. That is right for the hard outage it simulates and wrong for a real shutdown — the target then reads as satisfied while its units are dead, and the later start raced a stop job that was still queued. The helper now runs what the operator procedure and update-nodes.sh run: stop spinifex.target, wait for every spx process to exit, and additionally wait for systemd to have no spinifex job left queued before starting. That last wait is the one that closes this race. * fix: wait for the right NATS peer count in the cluster-restart helper WaitNATSPeers counts remote peers, so a healthy three-node cluster reports two. Asking for three could never be satisfied, and the run that hit it had in fact restarted all three NATS correctly.
202 lines
8.0 KiB
Go
202 lines
8.0 KiB
Go
//go:build e2e
|
|
|
|
package harness
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// A coordinated cluster shutdown followed by a start is the operation every
|
|
// software update performs, and it is the one path that had no e2e coverage:
|
|
// StopNode/StartNode simulate a hard outage, which deliberately leaves guests
|
|
// running, so nothing exercised a guest that was drained to stopped, had its
|
|
// volumes sealed, and then had to relaunch from that sealed state against
|
|
// dependencies that were themselves still starting. A guest was lost that way.
|
|
|
|
// clusterShutdownPhaseTimeout is passed to `spx admin cluster shutdown` as its
|
|
// per-phase budget. The default is 120s; DRAIN legitimately takes longer when
|
|
// several guests unmount at once, and a drain that times out is reported as
|
|
// success, so allowing the time is cheaper than the ambiguity.
|
|
const clusterShutdownPhaseTimeout = 10 * time.Minute
|
|
|
|
// spxProcessDrainTimeout bounds the wait for every spx process to exit after
|
|
// the units are stopped. Stopping the target returns once the target is
|
|
// inactive, which is not the same as every service having exited.
|
|
const spxProcessDrainTimeout = 3 * time.Minute
|
|
|
|
// ClusterShutdownAndRestart performs the full operator shutdown sequence and
|
|
// brings the cluster back: the coordinated phased shutdown, a stop of
|
|
// spinifex.target on every node, a confirmed wait for every spx process to exit
|
|
// and for systemd to have no spinifex job left queued, then a start of the
|
|
// target everywhere. It returns once NATS has reformed and every gateway
|
|
// answers, so a caller can immediately assert on guest state.
|
|
//
|
|
// The spx-process wait is the step that makes this a real restart rather than a
|
|
// systemctl call that returned early. spinifex-shutdown.service is ordered
|
|
// After= the storage services, so its drain runs while they are still up and
|
|
// their stop jobs queue behind it; `systemctl stop` returns as soon as the
|
|
// target is inactive, leaving predastore, viperblock and NATS running.
|
|
func ClusterShutdownAndRestart(t *testing.T, c *Cluster, env *Env) {
|
|
t.Helper()
|
|
|
|
if len(c.Nodes) < 2 {
|
|
t.Fatalf("cluster restart needs a multi-node cluster, have %d", len(c.Nodes))
|
|
}
|
|
|
|
ClusterShutdown(t, c)
|
|
|
|
Step(t, "start spinifex.target on all %d nodes", len(c.Nodes))
|
|
for _, n := range c.Nodes {
|
|
StartNode(t, n)
|
|
}
|
|
|
|
// WaitNATSPeers counts remote peers, so a whole cluster is one less than
|
|
// the node count.
|
|
Step(t, "wait NATS to reform to %d peers", len(c.Nodes)-1)
|
|
c.WaitNATSPeers(t, len(c.Nodes)-1, WithTimeout(3*time.Minute), WithPoll(2*time.Second))
|
|
|
|
Step(t, "wait every gateway to answer")
|
|
c.WaitGatewayHealthy(t, WithTimeout(3*time.Minute), WithPoll(2*time.Second))
|
|
|
|
if env != nil {
|
|
Step(t, "wait every daemon ready")
|
|
c.WaitDaemonReady(t, env, WithTimeout(3*time.Minute), WithPoll(2*time.Second))
|
|
}
|
|
}
|
|
|
|
// ClusterShutdown runs the coordinated shutdown and leaves the cluster down.
|
|
// Split out from ClusterShutdownAndRestart so a caller can assert on the
|
|
// stopped state, and so a t.Cleanup can restart unconditionally.
|
|
func ClusterShutdown(t *testing.T, c *Cluster) {
|
|
t.Helper()
|
|
|
|
ssh := NewPeerSSH()
|
|
leader := c.Nodes[0]
|
|
|
|
Step(t, "spx admin cluster shutdown via %s", leader.Name)
|
|
ctx, cancel := context.WithTimeout(context.Background(), clusterShutdownPhaseTimeout+2*time.Minute)
|
|
out, err := ssh.Run(ctx, leader.Addr, fmt.Sprintf(
|
|
"sudo spx admin cluster shutdown --timeout %s --config /etc/spinifex/spinifex.toml",
|
|
clusterShutdownPhaseTimeout))
|
|
cancel()
|
|
Detail(t, "cluster_shutdown", string(out))
|
|
if err != nil {
|
|
// The phases can complete and still lose the SSH channel as NATS goes
|
|
// down under it. The per-unit stop below is the authoritative teardown.
|
|
t.Logf("cluster shutdown on %s reported %v — proceeding to the per-unit stop", leader.Name, err)
|
|
}
|
|
|
|
// StopNode is not used here. It stops the service units directly and leaves
|
|
// spinifex.target active, which is right for the hard outage it simulates
|
|
// and wrong for a real shutdown: the target then reads as satisfied while
|
|
// its units are dead, and a later start can race a stop job that is still
|
|
// queued. Exactly that lost node3's NATS on the first run — stopped and
|
|
// never started again, so the cluster reformed to 2 peers of 3.
|
|
Step(t, "stop spinifex.target on all %d nodes", len(c.Nodes))
|
|
for _, n := range c.Nodes {
|
|
stopTarget(t, n)
|
|
}
|
|
|
|
Step(t, "confirm no spx process survives on any node")
|
|
for _, n := range c.Nodes {
|
|
waitNoSpxProcess(t, n)
|
|
}
|
|
|
|
Step(t, "confirm systemd has no spinifex jobs still queued")
|
|
for _, n := range c.Nodes {
|
|
waitNoPendingJobs(t, n)
|
|
}
|
|
}
|
|
|
|
// stopTarget stops spinifex.target, which is what the operator procedure runs
|
|
// and what update-nodes.sh runs. Non-fatal: the teardown can racily drop the
|
|
// SSH channel, and the waits below are the authoritative gate.
|
|
func stopTarget(t *testing.T, node Node) {
|
|
t.Helper()
|
|
|
|
ssh := NewPeerSSH()
|
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
|
|
defer cancel()
|
|
if _, err := ssh.Run(ctx, node.Addr, "sudo systemctl stop spinifex.target"); err != nil {
|
|
t.Logf("stop spinifex.target on %s: %v (proceeding — the waits are the gate)", node.Name, err)
|
|
}
|
|
}
|
|
|
|
// waitNoPendingJobs blocks until systemd has no queued job for any spinifex
|
|
// unit. Starting the target with a stop still queued is how a service ends up
|
|
// stopped by a job that completes after the start was issued.
|
|
func waitNoPendingJobs(t *testing.T, node Node) {
|
|
t.Helper()
|
|
|
|
ssh := NewPeerSSH()
|
|
EventuallyErr(t, func() error {
|
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
defer cancel()
|
|
out, err := ssh.Run(ctx, node.Addr,
|
|
"systemctl list-jobs --no-legend --no-pager | grep -c spinifex || true")
|
|
if err != nil {
|
|
return fmt.Errorf("%s list-jobs: %w", node.Name, err)
|
|
}
|
|
if n := strings.TrimSpace(string(out)); n != "0" {
|
|
return fmt.Errorf("%s still has %s queued spinifex job(s)", node.Name, n)
|
|
}
|
|
return nil
|
|
}, 2*time.Minute, 2*time.Second)
|
|
}
|
|
|
|
// stopUnitsHoldingSpx stops whatever units are still running the spx binary,
|
|
// found from the processes themselves rather than from a list.
|
|
//
|
|
// Every service is the same binary — `spx service <name> start` — so the set
|
|
// that has to stop is "whoever is still running it", and a hard-coded list goes
|
|
// stale silently the moment a service is added. StopNode's list omits
|
|
// spinifex-northstar and spinifex-qmp-collector, which is harmless for the hard
|
|
// outage it simulates and not harmless here.
|
|
func stopUnitsHoldingSpx(t *testing.T, node Node) {
|
|
t.Helper()
|
|
|
|
ssh := NewPeerSSH()
|
|
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute)
|
|
defer cancel()
|
|
|
|
// The unit name comes from each survivor's cgroup, so this needs no
|
|
// knowledge of which units exist.
|
|
const cmd = `for pid in $(pgrep -x spx || true); do
|
|
unit=$(grep -oE 'spinifex-[a-z0-9-]+\.service' "/proc/$pid/cgroup" 2>/dev/null | head -1)
|
|
[ -n "$unit" ] && sudo systemctl stop "$unit"
|
|
done; true`
|
|
if _, err := ssh.Run(ctx, node.Addr, cmd); err != nil {
|
|
t.Logf("stopUnitsHoldingSpx %s: %v (the wait below is the gate)", node.Name, err)
|
|
}
|
|
}
|
|
|
|
// waitNoSpxProcess blocks until `pgrep -x spx` finds nothing on node. A
|
|
// surviving process means the stop returned before the service did, and
|
|
// anything asserted after that is measuring the old process.
|
|
func waitNoSpxProcess(t *testing.T, node Node) {
|
|
t.Helper()
|
|
|
|
ssh := NewPeerSSH()
|
|
EventuallyErr(t, func() error {
|
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
defer cancel()
|
|
// pgrep exits 1 when nothing matches, which is the outcome wanted, so
|
|
// the count is read from stdout rather than from the exit status.
|
|
out, err := ssh.Run(ctx, node.Addr, "pgrep -x spx | wc -l")
|
|
if err != nil {
|
|
return fmt.Errorf("%s pgrep spx: %w", node.Name, err)
|
|
}
|
|
if n := strings.TrimSpace(string(out)); n != "0" {
|
|
// A survivor is a unit that was never asked to stop, or one that
|
|
// systemd restarted. Ask again rather than only polling.
|
|
stopUnitsHoldingSpx(t, node)
|
|
return fmt.Errorf("%s still has %s spx process(es)", node.Name, n)
|
|
}
|
|
return nil
|
|
}, spxProcessDrainTimeout, 3*time.Second)
|
|
}
|