Compare commits
7
Commits
a325615690
..
trunk
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3841b18820 | ||
|
|
48b714447f | ||
|
|
ba9650ee45 | ||
|
|
77af001af6 | ||
|
|
cf6936e225 | ||
|
|
b92725d2ec | ||
|
|
5e83c8db3b |
@@ -0,0 +1 @@
|
|||||||
|
cloud-hosting-platform/cloud-apache-container
|
||||||
@@ -24,9 +24,13 @@ FROM litespeedtech/openlitespeed:${OLS_VERSION}-lsphp${PHPVER}
|
|||||||
## - gettext-base: envsubst for render-shared-ols-config.sh
|
## - gettext-base: envsubst for render-shared-ols-config.sh
|
||||||
## - openssl: self-signed cert for the :443 listener (HAProxy verifies none)
|
## - openssl: self-signed cert for the :443 listener (HAProxy verifies none)
|
||||||
## - curl/ca-certificates: HEALTHCHECK
|
## - curl/ca-certificates: HEALTHCHECK
|
||||||
|
## - procps: provides pgrep, which entrypoint-shared-ols.sh's ols_running()
|
||||||
|
## liveness check depends on. Only transitively present via the base image
|
||||||
|
## today (Ubuntu 24.04 pulls it in) — pin it explicitly so it can't be
|
||||||
|
## pruned as "unused" and silently break the supervisor's crash detection.
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
inotify-tools gettext-base openssl ca-certificates curl && \
|
inotify-tools gettext-base openssl ca-certificates curl procps && \
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
|
rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
|
||||||
|
|
||||||
|
|||||||
@@ -23,10 +23,22 @@ useIpInProxyHeader 1
|
|||||||
|
|
||||||
## LSCache enabled at MODULE scope for the whole tier (dedicated cache volume,
|
## LSCache enabled at MODULE scope for the whole tier (dedicated cache volume,
|
||||||
## ephemeral across rebuilds; OLS auto-keys a per-vhost subdir under storagePath).
|
## ephemeral across rebuilds; OLS auto-keys a per-vhost subdir under storagePath).
|
||||||
## PUBLIC (anonymous) caching ONLY: enableCache 1 + checkPublicCache 1 let OLS
|
## PUBLIC (anonymous) caching ONLY: checkPublicCache 1 lets OLS serve cacheable,
|
||||||
## serve cacheable, non-logged-in responses marked by the LiteSpeed Cache WP
|
## non-logged-in responses that are EXPLICITLY marked by the LiteSpeed Cache WP
|
||||||
## plugin's X-LiteSpeed-Cache-Control headers (ignoreRespCacheCtrl=0 honors them).
|
## plugin's X-LiteSpeed-Cache-Control headers (ignoreRespCacheCtrl=0 honors them).
|
||||||
##
|
##
|
||||||
|
## enableCache is 0 ON PURPOSE. At module scope enableCache 1 means "cache every
|
||||||
|
## cacheable-looking public response by default", INCLUDING ones that carry no
|
||||||
|
## cache header at all. That bit us on Divi: LSCWP's Divi compat calls
|
||||||
|
## litespeed_disable_all for ?et_fb= / ?et_pb_preview= / ?p=N&preview=true, which
|
||||||
|
## switches the plugin off for the request, so it sends NO header (and its own
|
||||||
|
## "Do Not Cache Query Strings" never runs) — and OLS stored the Visual Builder
|
||||||
|
## page under enableCache 1. With enableCache 0 only responses that opt in via
|
||||||
|
## X-LiteSpeed-Cache-Control: public are stored; a plugin-disabled request is
|
||||||
|
## simply not cached. Measured on OLS 1.8.4 (2026-09-21): headerless response =
|
||||||
|
## miss,hit under 1; not cached under 0; explicit `public` header cached under
|
||||||
|
## both. Matches the dedicated cac-litespeed tier (configs/litespeed/site-template.tpl).
|
||||||
|
##
|
||||||
## PRIVATE caching is intentionally OFF (enablePrivateCache 0 + checkPrivateCache 0).
|
## PRIVATE caching is intentionally OFF (enablePrivateCache 0 + checkPrivateCache 0).
|
||||||
## Logged-in / cookie-bearing pages must NEVER be cached at the tier. We previously
|
## Logged-in / cookie-bearing pages must NEVER be cached at the tier. We previously
|
||||||
## left enablePrivateCache=1 assuming "no plugin -> nothing cached," but that was
|
## left enablePrivateCache=1 assuming "no plugin -> nothing cached," but that was
|
||||||
@@ -45,7 +57,7 @@ module cache {
|
|||||||
respCookieCache 1
|
respCookieCache 1
|
||||||
ignoreReqCacheCtrl 0
|
ignoreReqCacheCtrl 0
|
||||||
ignoreRespCacheCtrl 0
|
ignoreRespCacheCtrl 0
|
||||||
enableCache 1
|
enableCache 0
|
||||||
enablePrivateCache 0
|
enablePrivateCache 0
|
||||||
}
|
}
|
||||||
## ---- end shared-ols server append ----
|
## ---- end shared-ols server append ----
|
||||||
|
|||||||
@@ -109,6 +109,32 @@ export PHP_LSAPI_MAX_REQUESTS="${PHP_LSAPI_MAX_REQUESTS:-500}"
|
|||||||
export LSAPI_MAX_IDLE="${LSAPI_MAX_IDLE:-30}"
|
export LSAPI_MAX_IDLE="${LSAPI_MAX_IDLE:-30}"
|
||||||
export LSAPI_EXTRA_CHILDREN="${LSAPI_EXTRA_CHILDREN:-5}"
|
export LSAPI_EXTRA_CHILDREN="${LSAPI_EXTRA_CHILDREN:-5}"
|
||||||
export LSAPI_AVOID_FORK="${LSAPI_AVOID_FORK:-0}"
|
export LSAPI_AVOID_FORK="${LSAPI_AVOID_FORK:-0}"
|
||||||
|
## LSAPI_KEEP_LISTEN=2 works around a leak in lsphp's own bookkeeping — not a
|
||||||
|
## setting we're tuning for taste. The master keeps a `busy` worker counter in
|
||||||
|
## a MAP_SHARED page it shares with its children; measured live on whp01,
|
||||||
|
## that counter drifts NEGATIVE over days of uptime (arclightcourt.com-01 was
|
||||||
|
## at busy=-8 after 6.9 days; a healthy sibling sat at 0..9). php-src
|
||||||
|
## sapi/litespeed/lsapilib.c computes each child's idle-exit grace period as
|
||||||
|
## `10 + busy*10` seconds (capped by LSAPI_MAX_IDLE) INSIDE
|
||||||
|
## `if (s_keep_listener == 1)` — with busy=-8 that's `wait_time = -70`, so
|
||||||
|
## workers exit after ~1s idle instead of 10-30s. No worker then lingers in
|
||||||
|
## accept(), so the master's "an idle worker is already accepting, don't
|
||||||
|
## fork" guard never fires and it forks for every single connection —
|
||||||
|
## observed slamming the hard child ceiling under bot traffic
|
||||||
|
## (`Reached max children process limit`) and, on rejection, leaving the
|
||||||
|
## pending connection to rot in the kernel backlog as a 503. Confirmed
|
||||||
|
## asymmetry: the affected site logged 306 OLS-side `ExtConn timed out` /
|
||||||
|
## deadlock / `oops! 503` errors where an identically-configured healthy
|
||||||
|
## sibling logged 0. Restarting the container resets the counter to 0 (it's
|
||||||
|
## initialised at master start) but it drifts negative again over about a
|
||||||
|
## week — a reset, not a cure. LSAPI_KEEP_LISTEN=2 skips the `== 1` branch
|
||||||
|
## entirely, so idle-exit timing is never derived from the leaked counter and
|
||||||
|
## instead falls straight back to LSAPI_MAX_IDLE above. The is_enough_free_mem()
|
||||||
|
## memory guard sits immediately above that branch in lsapilib.c and is NOT
|
||||||
|
## part of it, so it still applies at =2 — this does not trade away the
|
||||||
|
## memory-pressure protection LSAPI_MAX_IDLE exists for. Still overridable
|
||||||
|
## (e.g. back to 1) per-container as an escape hatch.
|
||||||
|
export LSAPI_KEEP_LISTEN="${LSAPI_KEEP_LISTEN:-2}"
|
||||||
LSPHP_BIND="${LSPHP_BIND:-0.0.0.0:9000}"
|
LSPHP_BIND="${LSPHP_BIND:-0.0.0.0:9000}"
|
||||||
|
|
||||||
## ---- .user.ini support ----
|
## ---- .user.ini support ----
|
||||||
@@ -130,7 +156,7 @@ LSPHP_BIND="${LSPHP_BIND:-0.0.0.0:9000}"
|
|||||||
## .user.ini has not been remediated yet.
|
## .user.ini has not been remediated yet.
|
||||||
export LSPHP_ENABLE_USER_INI="${LSPHP_ENABLE_USER_INI:-on}"
|
export LSPHP_ENABLE_USER_INI="${LSPHP_ENABLE_USER_INI:-on}"
|
||||||
|
|
||||||
echo "Container memory: ${CONTAINER_MEMORY_MB}MB | PHP_LSAPI_CHILDREN=${PHP_LSAPI_CHILDREN} | LSAPI_MAX_IDLE=${LSAPI_MAX_IDLE} | PHPVER=${PHPVER} | bind=${LSPHP_BIND} | user_ini=${LSPHP_ENABLE_USER_INI}"
|
echo "Container memory: ${CONTAINER_MEMORY_MB}MB | PHP_LSAPI_CHILDREN=${PHP_LSAPI_CHILDREN} | LSAPI_MAX_IDLE=${LSAPI_MAX_IDLE} | LSAPI_KEEP_LISTEN=${LSAPI_KEEP_LISTEN} | PHPVER=${PHPVER} | bind=${LSPHP_BIND} | user_ini=${LSPHP_ENABLE_USER_INI}"
|
||||||
|
|
||||||
## Validate a numeric value destined for a generated php.ini fragment.
|
## Validate a numeric value destined for a generated php.ini fragment.
|
||||||
## Sets INI_NUM to the value when it is acceptable, and to "" (plus a WARNING)
|
## Sets INI_NUM to the value when it is acceptable, and to "" (plus a WARNING)
|
||||||
|
|||||||
@@ -75,19 +75,47 @@ term_handler() {
|
|||||||
}
|
}
|
||||||
trap term_handler TERM INT
|
trap term_handler TERM INT
|
||||||
|
|
||||||
## Variable + here-string, not a pipe into `grep -qi` — see the long note on the
|
## NOT `lswsctrl status` (unlike the otherwise-identical function in
|
||||||
## identical function in entrypoint-litespeed.sh: `grep -q` closing the pipe on
|
## entrypoint-litespeed.sh). `lswsctrl` appends a timestamped line to
|
||||||
## a match can leave the writer dying 141, and `set -o pipefail` (line 14) turns
|
## logs/lsrestart.log on EVERY invocation it makes, including `status` — and
|
||||||
## that into "OLS is down" *because* the running line matched. The reason is
|
## this loop polls every 3s forever. Measured on whp01: lsrestart.log is 96 MB,
|
||||||
## structural (a pipefail script must not pipe into an early-exit reader), not
|
## holding 1,819,286 `status` lines against 2,429 real `restart` lines; at one
|
||||||
## that this particular output is small; and the here-string is safe here for
|
## poll per 3s that's ~63 days of continuous polling, which is exactly the
|
||||||
## the separate reason that `lswsctrl status` is far below the size at which
|
## file's age, and it isn't rotated on any host (whp01/whp02/sdbees all growing
|
||||||
## bash spills a here-string to a temp file. A non-zero `lswsctrl` still counts
|
## at ~1.5 MB/day). So: check liveness directly instead of shelling out to a
|
||||||
## as not running, as pipefail made it count before.
|
## tool whose logging is a side effect we don't want on a fixed timer.
|
||||||
|
##
|
||||||
|
## Verified (docker run litespeedtech/openlitespeed:1.8.4-lsphp83, the exact
|
||||||
|
## base this image is built FROM — see Dockerfile.shared-ols): the running main
|
||||||
|
## process shows in `ps` as `openlitespeed (lshttpd - main)`, one PID, always
|
||||||
|
## present while OLS is up and absent the instant it is killed (checked via
|
||||||
|
## `ps aux` immediately after `kill -9` on the main PID). `pgrep -f` matches
|
||||||
|
## against the full command line, and no other process on this image's `ps`
|
||||||
|
## output contains that string, so this cannot cross-match an unrelated
|
||||||
|
## process. It also cannot self-match: pgrep excludes its own PID by default,
|
||||||
|
## and the invoking process here is bash executing this script file, whose own
|
||||||
|
## argv never contains the pattern text (only the *source lines* of this script
|
||||||
|
## do, which `pgrep -f` never sees).
|
||||||
|
##
|
||||||
|
## Deliberately NOT the pidfile (/tmp/lshttpd/lshttpd.pid, confirmed present in
|
||||||
|
## the same probe): pidfiles are known to go stale across a crash (verified —
|
||||||
|
## after `kill -9` the file still held the dead PID), and treating a stale PID
|
||||||
|
## as "alive" if the kernel ever reuses that number is a false positive this
|
||||||
|
## supervisor cannot afford (see below). `pgrep -f` reads the live process
|
||||||
|
## table, so there is no staleness window to reason about.
|
||||||
|
##
|
||||||
|
## Conservative on both failure directions, which matters because this is a
|
||||||
|
## supervisor predicate, not a metric: a false negative makes start_ols() run
|
||||||
|
## `lswsctrl start` against an already-running OLS — verified against the same
|
||||||
|
## probe base image, that is NOT a no-op, it sends SIGUSR1 to the live main
|
||||||
|
## process, i.e. the same graceful self-restart QUIC.cloud IP refreshes trigger
|
||||||
|
## (see entrypoint-litespeed.sh's note on that handoff) — a brief, zero-
|
||||||
|
## downtime blip at worst. A false positive is worse: it leaves a genuinely
|
||||||
|
## dead OLS un-revived until some later poll happens to notice. So if this
|
||||||
|
## predicate is ever in doubt it should err toward reporting "not running", not
|
||||||
|
## "running".
|
||||||
ols_running() {
|
ols_running() {
|
||||||
local st
|
pgrep -f 'lshttpd - main' >/dev/null 2>&1
|
||||||
st=$(/usr/local/lsws/bin/lswsctrl status 2>/dev/null) || return 1
|
|
||||||
grep -qi 'running with pid' <<<"$st"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MAX_STARTS=5
|
MAX_STARTS=5
|
||||||
|
|||||||
@@ -15,6 +15,20 @@
|
|||||||
## runs it and the panel monitors it (check-ols-htaccess-watcher.php).
|
## runs it and the panel monitors it (check-ols-htaccess-watcher.php).
|
||||||
set -uo pipefail
|
set -uo pipefail
|
||||||
|
|
||||||
|
## WATCH_ROOT is deliberately left as the host-wide /mnt/users, not narrowed to
|
||||||
|
## the shared-OLS tenant set, even though that set IS derivable in-container
|
||||||
|
## (render-shared-ols-config.sh's $SITES_ROOT/*/site.meta VHROOT= is exactly
|
||||||
|
## that list). Narrowing it would mean handing inotifywait a fixed argv list of
|
||||||
|
## VHROOT dirs at process start — and inotifywait cannot be told to watch a NEW
|
||||||
|
## directory once running. The panel provisions sites onto this container live,
|
||||||
|
## between renders; a site added after the watcher started would then sit
|
||||||
|
## outside every watch until the next container restart, i.e. exactly the
|
||||||
|
## silent-failure mode (spec 7) this script exists to prevent, now for brand
|
||||||
|
## new tenants instead of none. Doing this safely needs a reload path (SIGHUP
|
||||||
|
## re-exec off the current site.meta list, coordinated with
|
||||||
|
## render-shared-ols-config.sh) that does not exist yet and is its own change.
|
||||||
|
## So: WATCH_ROOT stays broad, and correctness comes entirely from the path
|
||||||
|
## match below, which is sufficient on its own.
|
||||||
WATCH_ROOT="${OLS_WATCH_ROOT:-/mnt/users}"
|
WATCH_ROOT="${OLS_WATCH_ROOT:-/mnt/users}"
|
||||||
DEBOUNCE="${OLS_HTACCESS_DEBOUNCE:-15}" # coalesce window (s)
|
DEBOUNCE="${OLS_HTACCESS_DEBOUNCE:-15}" # coalesce window (s)
|
||||||
FLOOR="${OLS_HTACCESS_FLOOR:-60}" # min seconds between restarts
|
FLOOR="${OLS_HTACCESS_FLOOR:-60}" # min seconds between restarts
|
||||||
@@ -24,16 +38,17 @@ last_restart=0
|
|||||||
log() { echo "ols-htaccess-watcher: $*" >&2; }
|
log() { echo "ols-htaccess-watcher: $*" >&2; }
|
||||||
|
|
||||||
do_restart() {
|
do_restart() {
|
||||||
|
path="$1"
|
||||||
now=$(date +%s)
|
now=$(date +%s)
|
||||||
if [ $((now - last_restart)) -lt "$FLOOR" ]; then
|
if [ $((now - last_restart)) -lt "$FLOOR" ]; then
|
||||||
log "within ${FLOOR}s floor — coalescing, skipping restart"
|
log "within ${FLOOR}s floor — coalescing, skipping restart ($path)"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
if "$LSWSCTRL" restart >/dev/null 2>&1; then
|
if "$LSWSCTRL" restart >/dev/null 2>&1; then
|
||||||
last_restart=$now
|
last_restart=$now
|
||||||
log "graceful restart issued (.htaccess change)"
|
log "graceful restart issued — $path changed"
|
||||||
else
|
else
|
||||||
log "WARNING: lswsctrl restart failed"
|
log "WARNING: lswsctrl restart failed ($path)"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,18 +56,34 @@ if ! command -v inotifywait >/dev/null 2>&1; then
|
|||||||
log "FATAL: inotifywait not installed (inotify-tools)"; exit 1
|
log "FATAL: inotifywait not installed (inotify-tools)"; exit 1
|
||||||
fi
|
fi
|
||||||
mkdir -p "$WATCH_ROOT"
|
mkdir -p "$WATCH_ROOT"
|
||||||
log "watching $WATCH_ROOT for .htaccess changes (debounce=${DEBOUNCE}s floor=${FLOOR}s)"
|
log "watching $WATCH_ROOT for docroot (public_html) .htaccess changes (debounce=${DEBOUNCE}s floor=${FLOOR}s)"
|
||||||
|
|
||||||
## -m monitor, -r recursive. We filter to .htaccess in the read loop rather than
|
## -m monitor, -r recursive. We filter in the read loop rather than --include
|
||||||
## --include so this works on older inotify-tools too. modify/create/delete/move
|
## so this works on older inotify-tools too. modify/create/delete/move all
|
||||||
## all matter (delete of .htaccess also changes rewrite behavior).
|
## matter (delete of .htaccess also changes rewrite behavior).
|
||||||
inotifywait -m -r -e modify,create,delete,move "$WATCH_ROOT" --format '%f' 2>/dev/null |
|
##
|
||||||
while read -r fname; do
|
## --format '%w%f' (full path), NOT '%f' (basename only). OLS reads .htaccess
|
||||||
case "$fname" in
|
## (RewriteFile) only from a vhost's DOCROOT — VHROOT, i.e.
|
||||||
.htaccess) ;;
|
## /mnt/users/<user>/<domain>/public_html (see render-shared-ols-config.sh /
|
||||||
|
## entrypoint-lsphp.sh) — never anything below it. A basename-only match fires
|
||||||
|
## for ANY .htaccess anywhere under a tenant, at any depth, and WordPress
|
||||||
|
## plugins write plenty of those that OLS never opens: measured on whp01 over
|
||||||
|
## 24h, this watcher fired 63 restarts, of which the docroot .htaccess actually
|
||||||
|
## changed in 0. All 28 distinct files behind those 63 were plugin guard files
|
||||||
|
## — Wordfence self-healing waf/views/vendor/tmp/models/lib/.htaccess, W3 Total
|
||||||
|
## Cache writing one per cached URL under wp-content/cache/page_enhanced/, plus
|
||||||
|
## WPForms/Gravity Forms/UpdraftPlus/Groundhogg/WP Staging upload guards — and
|
||||||
|
## most of those tenants are on the shared Apache tier (cac-fpm), not this OLS
|
||||||
|
## tier at all, so their cache churn was restarting the OLS serving 15 unrelated
|
||||||
|
## tenants for no reason. Matching the full path down to /public_html/.htaccess
|
||||||
|
## is what actually ties a change to something OLS will reread.
|
||||||
|
inotifywait -m -r -e modify,create,delete,move "$WATCH_ROOT" --format '%w%f' 2>/dev/null |
|
||||||
|
while read -r path; do
|
||||||
|
case "$path" in
|
||||||
|
*/public_html/.htaccess) ;;
|
||||||
*) continue ;;
|
*) continue ;;
|
||||||
esac
|
esac
|
||||||
## A tenant .htaccess changed. Coalesce the save-burst, then restart ONCE.
|
## A tenant DOCROOT .htaccess changed. Coalesce the save-burst, then restart ONCE.
|
||||||
##
|
##
|
||||||
## The coalesce is HARD-BOUNDED to DEBOUNCE seconds: a previous version blocked
|
## The coalesce is HARD-BOUNDED to DEBOUNCE seconds: a previous version blocked
|
||||||
## on `read -t DEBOUNCE` which, on a busy multi-tenant server, never timed out
|
## on `read -t DEBOUNCE` which, on a busy multi-tenant server, never timed out
|
||||||
@@ -69,5 +100,5 @@ while read -r fname; do
|
|||||||
break # ~2s of total quiet — the burst has settled
|
break # ~2s of total quiet — the burst has settled
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
do_restart
|
do_restart "$path"
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user