diff --git a/checks/README.md b/checks/README.md index ef06776..199518f 100644 --- a/checks/README.md +++ b/checks/README.md @@ -30,9 +30,9 @@ | [check-php-legacy-backport.py](check-php-legacy-backport.py) | 旧 PHP 源码包校验、补丁应用与构建失败处理 | Python 3、Shell、patch;可传入 PHP 7.3.33 源码包 | | [check-php-pecl.sh](check-php-pecl.sh) | 容器内下载、编译、加载 APCu 并验证缓存读写 | Bash、Docker、已构建的 PHP 镜像、网络 | | [check-php-legacy-runtime.py](check-php-legacy-runtime.py) | PHP CLI、FastCGI、OOM 恢复、扩展及上传行为 | Python 3、Docker、已构建的 PHP 镜像 | -| [check-mysql-cluster.sh](check-mysql-cluster.sh) | MySQL 默认客户端、备份恢复、全量与增量复制、只读及重启恢复 | Bash、Docker、已构建的 MySQL 主从镜像 | -| [check-postgresql-cluster.sh](check-postgresql-cluster.sh) | PostgreSQL 流复制、历史认证规则保留、配置、目录权限及数据版本保护 | Bash、Docker、已构建的 PostgreSQL 主从镜像 | -| [check-redis-cluster.sh](check-redis-cluster.sh) | Redis 主从复制、复制延迟等待、配置优先级、密码及 RDB/AOF 恢复 | Bash、Docker、已构建的 Redis 主从镜像 | +| [check-mysql-cluster.sh](check-mysql-cluster.sh) | MySQL 默认客户端、备份恢复、全量与增量复制、只读、重启恢复及容器日志 | Bash、Docker、已构建的 MySQL 主从镜像 | +| [check-postgresql-cluster.sh](check-postgresql-cluster.sh) | PostgreSQL 流复制、历史认证规则保留、配置、目录权限、数据版本保护及容器日志 | Bash、Docker、已构建的 PostgreSQL 主从镜像 | +| [check-redis-cluster.sh](check-redis-cluster.sh) | Redis 主从复制、复制延迟等待、配置优先级、密码、RDB/AOF 恢复及容器日志 | Bash、Docker、已构建的 Redis 主从镜像 | ## 何时执行 diff --git a/checks/check-mysql-cluster.sh b/checks/check-mysql-cluster.sh index d3d16a6..e3a91a3 100644 --- a/checks/check-mysql-cluster.sh +++ b/checks/check-mysql-cluster.sh @@ -57,6 +57,34 @@ wait_count() { return 1 } +check_logs() { + local container="$1" role="$2" phase="$3" + shift 3 + local log_file="$test_dir/$role-$phase.log" message started_at missing='required MySQL startup logs' + started_at="$(docker inspect --format '{{.State.StartedAt}}' "$container")" + local deadline=$((SECONDS + 60)) + while (( SECONDS < deadline )); do + docker logs --since "$started_at" "$container" > "$log_file" 2>&1 + missing='' + for message in "$@"; do + if ! grep -Fq -- "[INFO] MySQL cluster ($role): $message" "$log_file"; then + missing="$message" + break + fi + done + if [[ -z "$missing" ]] && ! grep -Eq "\\[INFO\\] MySQL cluster \\($role\\): Starting MySQL $role with server ID [0-9]+" "$log_file"; then + missing='MySQL startup stage' + fi + if [[ -z "$missing" ]] && ! grep -Eq '\[MY-010931\].*ready for connections.*port: 3306([[:space:]]|$)' "$log_file"; then + missing='MySQL engine readiness on port 3306' + fi + [[ -n "$missing" ]] || return 0 + sleep 1 + done + echo "Log check timed out after 60s: $container ($phase), waiting for $missing" >&2 + return 1 +} + run_replica() { docker run -d --name "$replica" --network "$network" \ -e MYSQL_REPLICATION_MODE=slave -e MYSQL_REPLICATION_USER=replicator \ @@ -94,6 +122,8 @@ docker run -d --name "$master" --network "$network" \ -v "$master_volume:/bitnami/mysql/data" \ -v "$test_dir/my.cnf:/opt/bitnami/mysql/conf/my.cnf" "$image" >/dev/null wait_healthy "$master" +check_logs "$master" master initial \ + 'Configuring root authentication' 'Creating replication account' 'Initialization complete' [[ "$(docker exec "$master" id -u)" == 1001 ]] docker exec -e MYSQL_PWD="$root_password" "$master" mysqladmin --user=root ping >/dev/null [[ "$(query "$master" "SELECT plugin FROM mysql.user WHERE User='root' AND Host='localhost'")" == mysql_native_password ]] @@ -107,6 +137,10 @@ docker exec -i -e MYSQL_PWD="$root_password" "$master" mysql --user=root ha_rest run_replica wait_healthy "$replica" wait_count 3 +check_logs "$replica" slave initial \ + 'Configuring root authentication' "Waiting for master $master:3306" 'Master connection established' \ + 'Creating initial dump from master' 'Restoring initial dump' "Configuring replication from $master:3306" \ + 'Replication configuration applied' 'Initialization complete' [[ "$(query "$replica" 'SELECT content FROM ha_test.records WHERE id=2')" == 'existing data' ]] [[ "$(query "$replica" 'SELECT @@super_read_only')" == 1 ]] if query "$replica" "INSERT INTO ha_test.records VALUES (99,'must fail')" >/dev/null 2>&1; then @@ -123,6 +157,7 @@ docker rm -v "$replica" >/dev/null run_replica wait_healthy "$replica" wait_count 5 +check_logs "$replica" slave persisted 'Using existing data' [[ "$(query "$replica" 'SELECT @@server_id')" == "$server_id" ]] if docker run --rm -e MYSQL_REPLICATION_MODE=slave -e MYSQL_REPLICATION_USER=replicator \ -e MYSQL_REPLICATION_PASSWORD="$replication_password" -e MYSQL_ROOT_PASSWORD="$root_password" \ @@ -135,6 +170,7 @@ grep -q 'different replication role' "$test_dir/wrong-role.log" docker exec "$master" rm /bitnami/mysql/data/.1panel-replication-mode docker restart "$master" >/dev/null wait_healthy "$master" +check_logs "$master" master persisted 'Using existing data' query "$master" "INSERT INTO ha_test.records VALUES (6,'after master restart');" >/dev/null wait_count 6 [[ "$(query "$replica" "SELECT COUNT(*) FROM performance_schema.replication_applier_status WHERE SERVICE_STATE='ON'")" == 1 ]] @@ -151,4 +187,14 @@ if docker run --rm -e MYSQL_REPLICATION_MODE=master -e MYSQL_REPLICATION_USER=re exit 1 fi grep -q 'previous initialization did not finish' "$test_dir/unfinished-init.log" +for log_file in "$test_dir/"*.log; do + for password in "$root_password" "$replication_password" unused-on-dump-replica; do + escaped_password="${password//\\/\\\\}" + escaped_password="$(printf '%s' "$escaped_password" | sed "s/'/''/g")" + if grep -Fq -- "$password" "$log_file" || grep -Fq -- "$escaped_password" "$log_file"; then + echo "Configured password found in container output: $(basename "$log_file")" >&2 + exit 1 + fi + done +done echo "MySQL cluster runtime checks passed: $image" diff --git a/checks/check-postgresql-cluster.sh b/checks/check-postgresql-cluster.sh index 7b6a4a8..ef9bf84 100644 --- a/checks/check-postgresql-cluster.sh +++ b/checks/check-postgresql-cluster.sh @@ -60,6 +60,46 @@ wait_rows() { return 1 } +check_log_secrets() { + if [[ "$1" == *"$password"* || "$1" == *"$replication_password"* ]]; then + printf >&2 'PostgreSQL logs exposed a configured password\n' + return 1 + fi +} + +check_startup_logs() { + local container="$1" + shift + local started_at logs message attempt + started_at="$(docker inspect --format '{{.State.StartedAt}}' "$container")" + for (( attempt=0; attempt<90; attempt++ )); do + logs="$(docker logs --since "$started_at" "$container" 2>&1)" + check_log_secrets "$logs" + if awk ' + /\[INFO\] PostgreSQL cluster \((master|slave)\): Starting PostgreSQL on port / { started = 1; ready = 0; next } + started && /database system is ready to accept/ { ready = 1 } + END { exit !ready } + ' <<< "$logs"; then + break + fi + sleep 1 + done + if (( attempt == 90 )); then + printf >&2 'PostgreSQL engine readiness log is missing after the current startup: %s\n' "$container" + return 1 + fi + if ! grep -Eq '^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z \[INFO\] PostgreSQL cluster \((master|slave)\): ' <<< "$logs"; then + printf >&2 'Structured PostgreSQL startup log is missing: %s\n' "$container" + return 1 + fi + for message in "$@"; do + if ! grep -Fq "$message" <<< "$logs"; then + printf >&2 'PostgreSQL startup log is missing for %s: %s\n' "$container" "$message" + return 1 + fi + done +} + docker image inspect "$image" >/dev/null major="$(docker run --rm "$image" bash -ec 'printf "%s" "$PG_MAJOR"')" case "$major" in @@ -87,6 +127,7 @@ docker run -d --name "$master" --network "$network" --network-alias pg-master \ -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ -v "${volumes[0]}:/bitnami/postgresql" -v "${volumes[1]}:/bitnami/postgresql/conf" "$image" >/dev/null wait_healthy "$master" +check_startup_logs "$master" 'Initializing master database' 'Configuring primary replication account' 'Startup configuration complete' [[ "$(sql "$master" 55432 'SHOW shared_buffers')" == 32MB ]] [[ "$(docker exec "$master" id -u)" == 1001 ]] [[ "$(sql "$master" 55432 "SELECT current_setting('server_version_num')::integer / 10000")" == "$major" ]] @@ -109,6 +150,7 @@ docker exec "$master" bash -ec ' ' docker restart "$master" >/dev/null wait_healthy "$master" +check_startup_logs "$master" 'Using existing master data; skipping initialization and base backup' 'Configuring primary replication account' [[ "$(sql "$master" 55432 'SELECT system_identifier FROM pg_control_system()')" == "$master_id" ]] [[ "$(docker exec -e "PGPASSWORD=$password" "$master" psql -h 127.0.0.1 -p 55432 -U postgres -d postgres -Atqc 'SELECT 1')" == 1 ]] if docker exec -e "PGPASSWORD=$password" "$master" psql -h "$master_ip" -p 55432 -U postgres -d postgres -Atqc 'SELECT 1' >/dev/null 2>&1; then @@ -123,6 +165,7 @@ docker run -d --name "$slave" --network "$network" \ -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ -v "${volumes[2]}:/bitnami/postgresql" -v "${volumes[3]}:/bitnami/postgresql/conf" "$image" >/dev/null wait_healthy "$slave" +check_startup_logs "$slave" 'Cloning standby database from primary; waiting for base backup' 'Standby base backup complete' 'Configuring standby replication connection' [[ "$(sql "$slave" 55433 'SELECT pg_is_in_recovery()')" == t ]] [[ "$(sql "$slave" 55433 'SHOW shared_buffers')" == 48MB ]] [[ "$(sql "$slave" 55433 'SELECT system_identifier FROM pg_control_system()')" == "$master_id" ]] @@ -145,9 +188,11 @@ docker stop "$slave" >/dev/null sql "$master" 55432 "INSERT INTO cluster_probe VALUES (3, 'offline-replica');" >/dev/null docker start "$slave" >/dev/null wait_healthy "$slave" +check_startup_logs "$slave" 'Using existing slave data; skipping initialization and base backup' 'Configuring standby replication connection' wait_rows 3 docker restart "$master" >/dev/null wait_healthy "$master" +check_startup_logs "$master" 'Using existing master data; skipping initialization and base backup' 'Configuring primary replication account' sql "$master" 55432 "INSERT INTO cluster_probe VALUES (4, 'restarted-primary');" >/dev/null wait_rows 4 [[ "$(docker exec "$slave" stat -c '%u:%g:%a' /bitnami/postgresql/conf/replication.pgpass)" == 1001:1001:600 ]] @@ -173,6 +218,10 @@ if docker run --name "$prefix-failed" --network "$network" \ printf >&2 'Clone unexpectedly succeeded against a closed port\n' exit 1 fi +failed_started_at="$(docker inspect --format '{{.State.StartedAt}}' "$prefix-failed")" +failed_logs="$(docker logs --since "$failed_started_at" "$prefix-failed" 2>&1)" +check_log_secrets "$failed_logs" +grep -Fq '[ERROR] PostgreSQL cluster (slave): Standby base backup failed' <<< "$failed_logs" [[ "$(docker run --rm -v "${volumes[7]}:/conf" "$image" cat /conf/user-file)" == 'preserve configuration' ]] [[ -z "$(docker run --rm -v "${volumes[6]}:/bitnami/postgresql" "$image" find /bitnami/postgresql -maxdepth 1 -name '.clone.*' -print)" ]] @@ -187,6 +236,7 @@ fi [[ "$(docker run --rm -v "${volumes[0]}:/bitnami/postgresql" "$image" cat /bitnami/postgresql/data/PG_VERSION)" == "$major" ]] docker start "$master" >/dev/null wait_healthy "$master" +check_startup_logs "$master" 'Using existing master data; skipping initialization and base backup' [[ "$(sql "$master" 55432 'SELECT system_identifier FROM pg_control_system()')" == "$master_id" ]] [[ "$(sql "$master" 55432 'SELECT count(*) FROM cluster_probe')" == 4 ]] @@ -204,6 +254,7 @@ docker run -d --user root --name "$master" --network "$network" --network-alias -e "POSTGRESQL_REPLICATION_PASSWORD=$replication_password" \ -v "${volumes[0]}:/bitnami/postgresql" -v "${volumes[1]}:/bitnami/postgresql/conf" "$image" >/dev/null wait_healthy "$master" +check_startup_logs "$master" 'Preparing directory permissions and switching to the postgres user' 'Using existing master data; skipping initialization and base backup' '[WARN] PostgreSQL cluster (master): Authentication configuration is missing' [[ "$(docker exec "$master" stat -c '%u:%g' /bitnami/postgresql)" == 1001:1001 ]] [[ "$(docker exec "$master" stat -c '%u' /proc/1)" == 1001 ]] [[ "$(docker exec "$master" grep -Fxc 'local all all peer' /bitnami/postgresql/conf/pg_hba.conf)" == 1 ]] diff --git a/checks/check-redis-cluster.sh b/checks/check-redis-cluster.sh index 2c01ddc..36c4ae2 100644 --- a/checks/check-redis-cluster.sh +++ b/checks/check-redis-cluster.sh @@ -62,6 +62,37 @@ wait_for() { return 1 } +check_logs() { + local container="$1" role="$2" + shift 2 + local started_at logs message password missing + started_at="$(docker inspect --format '{{.State.StartedAt}}' "$container")" + local deadline=$((SECONDS + 60)) + while (( SECONDS < deadline )); do + logs="$(docker logs --since "$started_at" "$container" 2>&1)" + for password in "$master_password" "$replica_password" config-password; do + if grep -Fq -- "$password" <<< "$logs"; then + printf 'Configured password found in container output: %s\n' "$container" >&2 + return 1 + fi + done + missing='' + for message in 'Validating replication settings' 'Preparing data and configuration directories' 'Starting Redis server' "$@"; do + if ! grep -Fq -- "[INFO] Redis cluster ($role): $message" <<< "$logs"; then + missing="$message" + break + fi + done + if [[ -z "$missing" && "$logs" != *'Ready to accept connections'* ]]; then + missing='Redis engine accepting connections' + fi + [[ -n "$missing" ]] || return 0 + sleep 1 + done + printf 'Log check timed out after 60s: %s, waiting for %s\n' "$container" "$missing" >&2 + return 1 +} + containers+=("$prefix-invalid" "$prefix-init") if docker run --rm --name "$prefix-invalid" -e REDIS_PASSWORD=unused -e REDIS_REPLICATION_MODE=sentinel "$IMAGE" >/dev/null 2>&1; then printf '%s\n' 'Unsupported replication mode was accepted' >&2 @@ -95,6 +126,8 @@ containers+=("$replica") docker start "$master" "$replica" >/dev/null wait_for PONG master_cli PING wait_for PONG replica_cli PING +check_logs "$master" master 'Using mounted Redis configuration' 'Applying additional Redis arguments' +check_logs "$replica" slave 'Generating default Redis configuration with AOF enabled' 'Applying replica connection settings' 'Applying additional Redis arguments' [[ "$(master_cli INFO server | tr -d '\r' | sed -n 's/^redis_version://p')" == "$redis_version" ]] [[ "$(docker exec "$master" id -u)" == 1001 ]] @@ -125,6 +158,7 @@ docker exec "$replica" test -s "$aof_file" docker kill --signal KILL "$master" >/dev/null docker start "$master" >/dev/null wait_for PONG master_cli PING +check_logs "$master" master 'Using mounted Redis configuration' [[ "$(master_cli GET counter)" == 40 ]] [[ "$(master_cli GET entry:40)" == 'value 40' ]] @@ -143,11 +177,15 @@ docker stop --time 10 "$master" >/dev/null docker kill --signal KILL "$replica" >/dev/null docker start "$replica" >/dev/null wait_for PONG replica_cli PING +check_logs "$replica" slave 'Generating default Redis configuration with AOF enabled' 'Applying replica connection settings' [[ "$(replica_cli GET counter)" == 80 ]] [[ "$(replica_cli GET entry:80)" == 'value 80' ]] docker start "$master" >/dev/null wait_for PONG master_cli PING +check_logs "$master" master 'Using mounted Redis configuration' [[ "$(master_cli INCR counter)" == 81 ]] wait_for 81 replica_cli GET counter +check_logs "$master" master 'Using mounted Redis configuration' +check_logs "$replica" slave 'Applying replica connection settings' printf 'Redis %s replication, configuration, persistence and reconnect checks passed.\n' "$redis_version" diff --git a/database-ha/mysql/Dockerfile b/database-ha/mysql/Dockerfile index 54113bf..e9312bb 100644 --- a/database-ha/mysql/Dockerfile +++ b/database-ha/mysql/Dockerfile @@ -22,7 +22,8 @@ COPY healthcheck.sh /opt/bitnami/scripts/mysql/healthcheck.sh RUN chmod 0755 /usr/local/bin/1panel-mysql-entrypoint /opt/bitnami/scripts/mysql/healthcheck.sh && \ chown mysql:mysql /opt/bitnami/mysql/conf/my.cnf && \ - ln -sf /opt/bitnami/mysql/conf/my.cnf /etc/my.cnf + ln -sf /opt/bitnami/mysql/conf/my.cnf /etc/my.cnf && \ + ln -sf /proc/1/fd/1 /opt/bitnami/mysql/logs/mysqld.log USER 1001:1001 diff --git a/database-ha/mysql/README.md b/database-ha/mysql/README.md index c65a6db..0490d2b 100644 --- a/database-ha/mysql/README.md +++ b/database-ha/mysql/README.md @@ -43,12 +43,20 @@ bash checks/check-mysql-cluster.sh 1panel/mysql-cluster:8.4.13 - 配置:`/opt/bitnami/mysql/conf/my.cnf`,支持只读挂载 - 健康检查:`/opt/bitnami/scripts/mysql/healthcheck.sh` - socket、PID:`/opt/bitnami/mysql/tmp/` -- 错误日志:`/opt/bitnami/mysql/logs/mysqld.log` +- 错误日志:`/opt/bitnami/mysql/logs/mysqld.log`,镜像内链接到 `/proc/1/fd/1` 官方客户端默认配置路径 `/etc/my.cnf` 关联到上述兼容配置文件,因此面板直接调用 `mysql`、`mysqladmin`、`mysqldump` 时也会使用正确的 socket;兼容配置仍支持只读挂载。 入口覆盖配置中的数据库程序目录、插件目录、数据目录、socket、PID、错误日志、复制日志与 server ID,以兼容现有 Bitnami 布局的配置文件。从库以 `read_only`、`super_read_only` 启动。选择 `mysql_native_password` 时会显式启用 MySQL 8.4 的该认证插件。 +## 日志 + +MySQL 引擎错误日志通过上述链接写入 PID 1 的标准输出,初始化和正常运行期间都可以通过 `docker logs <容器名>` 或面板容器日志查看。日志文件路径保留用于兼容配置,不再是镜像内独立累积的普通文件。 + +入口同时输出新库初始化、已有数据启动、等待主库、全量备份与导入、复制配置等阶段的进度。等待主库期间按间隔报告重试进度;阶段与重试消息不输出密码或完整认证命令。 + +初始化配置完成表示入口已完成当前节点的初始化和配置步骤,不代表复制 IO、SQL 线程均已运行或数据已经追平。健康检查仅验证本地 SQL 连接;复制状态仍需通过面板主从状态或 `SHOW REPLICA STATUS\G` 检查,包括 `Replica_IO_Running`、`Replica_SQL_Running` 及对应错误字段。 + ## 初始化与重启 首次启动主库时创建 root 与复制账户。从库全量初始化通过 `mysqldump --single-transaction --source-data=2` 获取数据与对应 binlog 位点,导入后配置复制,从该位点继续接收增量。主库已有数据时也使用该流程。 diff --git a/database-ha/mysql/docker-entrypoint.sh b/database-ha/mysql/docker-entrypoint.sh index fe247b9..76488ed 100644 --- a/database-ha/mysql/docker-entrypoint.sh +++ b/database-ha/mysql/docker-entrypoint.sh @@ -10,8 +10,14 @@ if [[ "$1" != mysqld ]]; then fi shift +log() { + local level="$1" + shift + printf '%s [%s] MySQL cluster (%s): %s\n' "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" "$level" "${role:-startup}" "$*" >&2 +} + fail() { - echo "MySQL cluster: $*" >&2 + log ERROR "$*" exit 1 } @@ -29,14 +35,20 @@ mysql_local() { cleanup_init() { local result="$1" + trap - EXIT + log ERROR "Setup failed with exit code $result; data has been preserved in $data_dir" + log INFO 'Stopping temporary MySQL server' MYSQL_PWD="$mysql_password" mysqladmin --defaults-file="$config_file" --socket="$socket_file" \ --user=root shutdown >/dev/null 2>&1 || true - [[ ! -f "$log_file" ]] || cat "$log_file" >&2 + if [[ ! -L "$log_file" && -f "$log_file" ]]; then + tail -n 100 "$log_file" >&2 + fi exit "$result" } role="${MYSQL_REPLICATION_MODE:-}" [[ "$role" == master || "$role" == slave ]] || fail 'MYSQL_REPLICATION_MODE must be master or slave' +log INFO 'Validating replication settings' [[ -n "${MYSQL_ROOT_PASSWORD:-}" ]] || fail 'MYSQL_ROOT_PASSWORD is required' [[ -n "${MYSQL_REPLICATION_USER:-}" && -n "${MYSQL_REPLICATION_PASSWORD:-}" ]] || \ fail 'MYSQL_REPLICATION_USER and MYSQL_REPLICATION_PASSWORD are required' @@ -88,29 +100,34 @@ if [[ "$role" == slave && "${MYSQL_REPLICATION_SLAVE_DUMP:-false}" == true ]]; t fi if [[ -d "$data_dir/mysql" && ! -f "$data_dir/.1panel-replication-mode" ]]; then + log INFO 'Checking replication role in existing data' trap 'cleanup_init "$?"' EXIT + log INFO 'Starting temporary MySQL server' "${args[@]}" --daemonize --skip-networking --read-only=OFF --super-read-only=OFF --skip-replica-start channels="$(mysql_local --execute="SELECT COUNT(*) FROM performance_schema.replication_connection_configuration WHERE HOST<>''")" if [[ "$role" == master && "$channels" != 0 || "$role" == slave && "$channels" == 0 ]]; then fail 'existing data replication channels do not match MYSQL_REPLICATION_MODE' fi + log INFO 'Stopping temporary MySQL server' MYSQL_PWD="$mysql_password" mysqladmin --defaults-file="$config_file" --socket="$socket_file" --user=root shutdown printf '%s\n' "$role" > "$data_dir/.1panel-replication-mode" trap - EXIT fi if [[ ! -d "$data_dir/mysql" ]]; then - echo "MySQL cluster: initializing $role" + log INFO "Initializing $role database" touch "$data_dir/.1panel-initializing" mysql_password='' trap 'cleanup_init "$?"' EXIT "${args[@]}" --initialize-insecure --read-only=OFF --super-read-only=OFF + log INFO 'Starting temporary MySQL server' "${args[@]}" --daemonize --skip-networking --read-only=OFF --super-read-only=OFF --skip-replica-start root_password="$MYSQL_ROOT_PASSWORD" if [[ "$role" == slave && "${MYSQL_REPLICATION_SLAVE_DUMP:-false}" == true ]]; then root_password="$MYSQL_MASTER_ROOT_PASSWORD" fi + log INFO 'Configuring root authentication' mysql_local < 0 && master_port <= 65535 )) || fail 'invalid MYSQL_MASTER_PORT_NUMBER' master_user="${MYSQL_MASTER_ROOT_USER:-root}" + log INFO "Waiting for master $MYSQL_MASTER_HOST:$master_port" ready=false - for (( attempt=0; attempt<300; attempt++ )); do - if MYSQL_PWD="$MYSQL_MASTER_ROOT_PASSWORD" mysql --no-defaults --protocol=tcp \ - --host="$MYSQL_MASTER_HOST" --port="$master_port" --user="$master_user" --execute='SELECT 1' >/dev/null 2>&1; then + wait_started=$SECONDS + next_wait_log=0 + failure_reason='SQL connection failed' + for (( attempt=1; attempt<=300; attempt++ )); do + if connection_error="$(MYSQL_PWD="$MYSQL_MASTER_ROOT_PASSWORD" mysql --no-defaults --protocol=tcp --connect-timeout=5 \ + --host="$MYSQL_MASTER_HOST" --port="$master_port" --user="$master_user" --execute='SELECT 1' 2>&1)"; then ready=true + log INFO "Master connection established after $attempt attempt(s), $((SECONDS - wait_started))s elapsed" break fi + case "$connection_error" in + *'ERROR 1045'*|*'ERROR 1698'*) failure_reason='authentication rejected; verify the master credentials' ;; + *'ERROR 2005'*) failure_reason='master hostname could not be resolved' ;; + *'ERROR 2003'*) + case "$connection_error" in + *'(110)'*|*'timed out'*) failure_reason='connection timed out; verify the master address, port and network access' ;; + *'(111)'*|*'Connection refused'*) failure_reason='connection refused; verify the master is listening on this address and port' ;; + *) failure_reason='TCP connection to the master failed' ;; + esac + ;; + *'ERROR 2026'*) failure_reason='TLS connection failed; verify the master TLS settings' ;; + *) failure_reason='SQL connection failed' ;; + esac + elapsed=$((SECONDS - wait_started)) + if (( elapsed >= next_wait_log || attempt == 300 )); then + log WARN "Master $MYSQL_MASTER_HOST:$master_port is not ready (attempt $attempt/300, ${elapsed}s elapsed): $failure_reason" + next_wait_log=$((elapsed + 30)) + fi sleep 2 done - [[ "$ready" == true ]] || fail 'master did not become available' + [[ "$ready" == true ]] || fail "master did not become available at $MYSQL_MASTER_HOST:$master_port after 300 attempts ($((SECONDS - wait_started))s elapsed): $failure_reason" coordinates='' if [[ "${MYSQL_REPLICATION_SLAVE_DUMP:-false}" == true ]]; then dump_file="$data_dir/.1panel-initial-dump.sql" + log INFO 'Creating initial dump from master' MYSQL_PWD="$MYSQL_MASTER_ROOT_PASSWORD" mysqldump --no-defaults --protocol=tcp \ --host="$MYSQL_MASTER_HOST" --port="$master_port" --user="$master_user" \ --all-databases --single-transaction --quick --source-data=2 --set-gtid-purged=OFF \ --routines --events --triggers > "$dump_file" + log INFO 'Initial dump created' read -r source_file source_position < <(sed -n "s/^-- CHANGE REPLICATION SOURCE TO SOURCE_LOG_FILE='\([^']*\)', SOURCE_LOG_POS=\([0-9]*\);$/\1 \2/p" "$dump_file") [[ -n "$source_file" && "$source_position" =~ ^[0-9]+$ ]] || fail 'dump did not contain replication coordinates' + log INFO "Restoring initial dump (source file $source_file, position $source_position)" mysql_local < "$dump_file" mysql_local --execute='FLUSH PRIVILEGES' rm "$dump_file" + log INFO 'Initial dump restored' coordinates="SOURCE_LOG_FILE=$(sql_literal "$source_file"), SOURCE_LOG_POS=$source_position," fi + log INFO "Configuring replication from $MYSQL_MASTER_HOST:$master_port" mysql_local < "$data_dir/.1panel-server-id" printf '%s\n' "$role" > "$data_dir/.1panel-replication-mode" rm "$data_dir/.1panel-initializing" trap - EXIT - echo 'MySQL cluster: initialization complete' + log INFO 'Initialization complete' +else + log INFO 'Using existing data' fi +log INFO "Starting MySQL $role with server ID $server_id" exec "${args[@]}" diff --git a/database-ha/postgresql/README.md b/database-ha/postgresql/README.md index 6bd540c..8f79ad2 100644 --- a/database-ha/postgresql/README.md +++ b/database-ha/postgresql/README.md @@ -53,6 +53,16 @@ docker build --build-arg POSTGRESQL_VERSION=17.12 -t 1panel/postgresql-cluster:1 已有完整数据时直接重启,不重新初始化或克隆。没有 `PG_VERSION` 的非空数据目录会拒绝启动;克隆失败时仅移除本次创建的临时备份目录,不删除已有数据。已有主库目录不能直接当从库运行,已有从库也不能通过修改环境变量自动提升为主库。 +## 日志 + +入口阶段日志采用 UTC 时间、级别和节点角色格式,例如 `2026-11-18T00:00:00Z [INFO] PostgreSQL cluster (master): ...`,写入标准错误,可通过 `docker logs <容器名>` 或面板容器日志查看。日志覆盖参数校验、新主库初始化、从库全量克隆、复制角色配置、已有数据启动,以及配置和认证文件的保留或生成。 + +从库克隆前后输出阶段消息,`pg_basebackup --verbose` 提供等待 checkpoint、接收 WAL 等原生进度;克隆失败会保留 PostgreSQL 的错误诊断并输出失败摘要,不增加自动重试或改变现有数据清理范围。入口阶段消息不输出密码、完整连接串、SQL 或启动命令。 + +默认配置下,PostgreSQL 引擎日志写入标准错误,容器日志可同时显示初始化和正常运行日志。入口不覆盖用户的 `log_destination`、`logging_collector` 等日志设置;自定义为文件、syslog 或其他目标时,应到对应目标查看引擎日志,容器日志中的入口阶段消息仍然保留。自定义 SQL 日志设置及初始化脚本的输出由使用者管理。 + +`Startup configuration complete` 仅表示入口配置步骤完成,不代表引擎已就绪、从库已开始流复制或数据已经追平。健康检查及主从复制状态需分别确认。 + ## 旧数据迁移边界 支持 PostgreSQL 15–18 各自主版本内的新建主从和本镜像数据的重复启动。已在 ARM64 隔离环境中验证 `bitnamilegacy/postgresql:17` 的 PostgreSQL 17.6 单主样本切换到本镜像 17.12:独立的数据卷和配置卷保持 `1001:1001` 权限,原表可读取,新数据可写入并在重启后保留。该样本缺失的配置及认证文件由本镜像生成默认值,旧镜像内部未持久化的自定义认证规则不会恢复。 @@ -67,4 +77,4 @@ docker build --build-arg POSTGRESQL_VERSION=17.12 -t 1panel/postgresql-cluster:1 IMAGE=1panel/postgresql-cluster:18.7 bash checks/check-postgresql-cluster.sh ``` -验证脚本从镜像读取 `PG_MAJOR`,使用唯一名称的临时网络、容器和卷,覆盖新库远程 SCRAM 认证、已有数据及从库克隆认证文件的白名单允许与拒绝、两处认证文件缺失时的默认规则、持续复制、重复启动、独立配置卷、非默认端口、特殊字符密码、异主版本数据安全拒绝及失败时保留已有目录。只清理本次创建的资源。 +验证脚本从镜像读取 `PG_MAJOR`,使用唯一名称的临时网络、容器和卷,覆盖新库远程 SCRAM 认证、已有数据及从库克隆认证文件的白名单允许与拒绝、两处认证文件缺失时的默认规则、持续复制、重复启动、独立配置卷、非默认端口、特殊字符密码、异主版本数据安全拒绝及失败时保留已有目录。日志校验按容器本次启动时间截取,检查启动阶段、最终启动之后的引擎 ready 日志、克隆失败摘要及配置密码未出现在日志中,避免历史日志或临时服务器日志造成误判。只清理本次创建的资源。 diff --git a/database-ha/postgresql/entrypoint.sh b/database-ha/postgresql/entrypoint.sh index e3dcc1f..2355832 100644 --- a/database-ha/postgresql/entrypoint.sh +++ b/database-ha/postgresql/entrypoint.sh @@ -13,6 +13,17 @@ if _pg_want_help "$@"; then exec "$@" fi +log() { + local level="$1" + shift + printf '%s [%s] PostgreSQL cluster (%s): %s\n' "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" "$level" "${mode:-startup}" "$*" >&2 +} + +fail() { + log ERROR "$*" + exit 1 +} + export PGDATA=/bitnami/postgresql/data export POSTGRES_USER=postgres export POSTGRES_PASSWORD="${POSTGRESQL_PASSWORD:-}" @@ -23,61 +34,59 @@ conf=/bitnami/postgresql/conf case "$mode" in master|slave) ;; - *) printf >&2 'POSTGRESQL_REPLICATION_MODE must be master or slave\n'; exit 1 ;; + *) fail 'POSTGRESQL_REPLICATION_MODE must be master or slave' ;; esac +log INFO 'Validating replication settings' if [[ ! "$PGPORT" =~ ^[0-9]{1,5}$ ]] || (( 10#$PGPORT < 1 || 10#$PGPORT > 65535 )); then - printf >&2 'POSTGRESQL_PORT_NUMBER must be between 1 and 65535\n' - exit 1 + fail 'POSTGRESQL_PORT_NUMBER must be between 1 and 65535' fi export PGPORT="$((10#$PGPORT))" if [[ -z "${POSTGRESQL_REPLICATION_USER:-}" || -z "${POSTGRESQL_REPLICATION_PASSWORD:-}" ]]; then - printf >&2 'POSTGRESQL_REPLICATION_USER and POSTGRESQL_REPLICATION_PASSWORD are required\n' - exit 1 + fail 'POSTGRESQL_REPLICATION_USER and POSTGRESQL_REPLICATION_PASSWORD are required' fi if [[ "$POSTGRESQL_REPLICATION_USER" == postgres ]]; then - printf >&2 'The replication user must differ from postgres\n' - exit 1 + fail 'The replication user must differ from postgres' fi for value in "$POSTGRESQL_REPLICATION_USER" "$POSTGRESQL_REPLICATION_PASSWORD"; do if [[ "$value" == *$'\n'* || "$value" == *$'\r'* ]]; then - printf >&2 'Replication user and password must not contain line breaks\n' - exit 1 + fail 'Replication user and password must not contain line breaks' fi done +trap 'log ERROR "Startup failed with exit code $?; check preceding PostgreSQL messages"' ERR mkdir -p "$conf" docker_setup_env docker_create_db_directories if [[ "$(id -u)" == 0 ]]; then + log INFO 'Preparing directory permissions and switching to the postgres user' chown postgres:postgres /bitnami/postgresql chown -R postgres:postgres "$conf" exec gosu postgres "$0" "$@" fi if [[ -s "$PGDATA/PG_VERSION" && "$(< "$PGDATA/PG_VERSION")" != "$PG_MAJOR" ]]; then - printf >&2 'Existing data requires PostgreSQL %s; this image uses %s\n' "$(< "$PGDATA/PG_VERSION")" "$PG_MAJOR" - exit 1 + fail "Existing data requires PostgreSQL $(< "$PGDATA/PG_VERSION"); this image uses $PG_MAJOR" fi if [[ -z "$DATABASE_ALREADY_EXISTS" && -n "$(find "$PGDATA" -mindepth 1 -maxdepth 1 -print -quit)" ]]; then - printf >&2 'PGDATA is nonempty without PG_VERSION; refusing to initialize or delete its contents\n' - exit 1 + fail 'PGDATA is nonempty without PG_VERSION; refusing to initialize or delete its contents' fi if [[ "$mode" == slave && -n "$DATABASE_ALREADY_EXISTS" && ! -f "$PGDATA/standby.signal" ]]; then - printf >&2 'Existing data is not a standby; refusing to change its role\n' - exit 1 + fail 'Existing data is not a standby; refusing to change its role' +fi +if [[ -n "$DATABASE_ALREADY_EXISTS" ]]; then + log INFO "Using existing $mode data; skipping initialization and base backup" fi if [[ "$mode" == slave ]]; then - : "${POSTGRESQL_MASTER_HOST:?POSTGRESQL_MASTER_HOST is required for a slave}" + [[ -n "${POSTGRESQL_MASTER_HOST:-}" ]] || fail 'POSTGRESQL_MASTER_HOST is required for a slave' master_port="${POSTGRESQL_MASTER_PORT_NUMBER:-5432}" if [[ ! "$master_port" =~ ^[0-9]{1,5}$ ]] || (( 10#$master_port < 1 || 10#$master_port > 65535 )); then - printf >&2 'POSTGRESQL_MASTER_PORT_NUMBER must be between 1 and 65535\n' - exit 1 + fail 'POSTGRESQL_MASTER_PORT_NUMBER must be between 1 and 65535' fi master_port="$((10#$master_port))" if [[ "$POSTGRESQL_MASTER_HOST" == *$'\n'* || "$POSTGRESQL_MASTER_HOST" == *$'\r'* ]]; then - printf >&2 'Replication host must not contain line breaks\n' - exit 1 + fail 'Replication host must not contain line breaks' fi + log INFO 'Preparing standby replication credentials' export PGPASSFILE="$conf/replication.pgpass" umask 077 credentials=() @@ -91,36 +100,48 @@ if [[ "$mode" == slave ]]; then if [[ -z "$DATABASE_ALREADY_EXISTS" ]]; then clone_dir="$(mktemp -d /bitnami/postgresql/.clone.XXXXXX)" trap 'rm -rf -- "$clone_dir"' EXIT - pg_basebackup --host "$POSTGRESQL_MASTER_HOST" --port "$master_port" \ + log INFO 'Cloning standby database from primary; waiting for base backup' + if ! pg_basebackup --host "$POSTGRESQL_MASTER_HOST" --port "$master_port" \ --username "$POSTGRESQL_REPLICATION_USER" --pgdata "$clone_dir" \ - --wal-method stream --write-recovery-conf --no-password --no-clean + --wal-method stream --write-recovery-conf --no-password --no-clean --verbose; then + fail 'Standby base backup failed; temporary clone will be removed and existing data preserved' + fi rmdir "$PGDATA" mv "$clone_dir" "$PGDATA" trap - EXIT + log INFO 'Standby base backup complete' fi + log INFO 'Configuring standby replication connection' master_host="${POSTGRESQL_MASTER_HOST//\\/\\\\}" master_host="${master_host//\'/\\\'}" replication_user="${POSTGRESQL_REPLICATION_USER//\\/\\\\}" replication_user="${replication_user//\'/\\\'}" set -- "$@" -c "primary_conninfo=host='$master_host' port='$master_port' user='$replication_user' passfile='$PGPASSFILE'" elif [[ -f "$PGDATA/standby.signal" || -f "$PGDATA/recovery.signal" ]]; then - printf >&2 'Existing data is in recovery; refusing to change its role\n' - exit 1 + fail 'Existing data is in recovery; refusing to change its role' elif [[ -z "$DATABASE_ALREADY_EXISTS" ]]; then + log INFO 'Initializing master database' docker_verify_minimum_env docker_init_database_dir --auth-host=scram-sha-256 printf '\nhost all all all scram-sha-256\n' >> "$PGDATA/pg_hba.conf" fi if [[ ! -e "$conf/postgresql.conf" ]]; then + log INFO 'Creating default PostgreSQL configuration' printf "listen_addresses = '*'\nwal_level = replica\nhot_standby = on\nwal_keep_size = '128MB'\n" > "$conf/postgresql.conf" +else + log INFO 'Using existing PostgreSQL configuration' fi if [[ ! -e "$conf/pg_hba.conf" ]]; then if [[ -f "$PGDATA/pg_hba.conf" ]]; then + log INFO 'Copying existing database authentication configuration' cp "$PGDATA/pg_hba.conf" "$conf/pg_hba.conf" else + log WARN 'Authentication configuration is missing; creating default peer and SCRAM rules' printf 'local all all peer\nhost all all all scram-sha-256\n' > "$conf/pg_hba.conf" fi +else + log INFO 'Using existing authentication configuration' fi set -- "$@" -c "config_file=$conf/postgresql.conf" -c "data_directory=$PGDATA" \ -c "hba_file=$conf/pg_hba.conf" -c "ident_file=$PGDATA/pg_ident.conf" \ @@ -129,10 +150,13 @@ set -- "$@" -c "config_file=$conf/postgresql.conf" -c "data_directory=$PGDATA" \ if [[ "$mode" == master ]]; then rule='host replication all all scram-sha-256' if ! grep -Fqx "$rule" "$conf/pg_hba.conf"; then + log INFO 'Adding primary replication authentication rule' printf '\n%s\n' "$rule" >> "$conf/pg_hba.conf" fi + log INFO 'Starting temporary PostgreSQL server' docker_temp_server_start "$@" - trap 'docker_temp_server_stop' EXIT + trap 'log INFO "Stopping temporary PostgreSQL server"; docker_temp_server_stop' EXIT + log INFO 'Configuring primary replication account' PGPASSWORD="$POSTGRES_PASSWORD" docker_process_sql --dbname postgres <<'SQL' \getenv replication_user POSTGRESQL_REPLICATION_USER \getenv replication_password POSTGRESQL_REPLICATION_PASSWORD @@ -141,11 +165,15 @@ WHERE NOT EXISTS (SELECT FROM pg_roles WHERE rolname = :'replication_user') \gex SELECT format('ALTER ROLE %I WITH LOGIN REPLICATION PASSWORD %L', :'replication_user', :'replication_password') \gexec SQL if [[ -z "$DATABASE_ALREADY_EXISTS" ]]; then + log INFO 'Initializing databases and running initialization scripts' docker_setup_db docker_process_init_files /docker-entrypoint-initdb.d/* fi + log INFO 'Stopping temporary PostgreSQL server' docker_temp_server_stop trap - EXIT fi +log INFO 'Startup configuration complete; replication health must be checked separately' +log INFO "Starting PostgreSQL on port $PGPORT" exec "$@" diff --git a/database-ha/redis/README.md b/database-ha/redis/README.md index bb8aef5..ebe040a 100644 --- a/database-ha/redis/README.md +++ b/database-ha/redis/README.md @@ -54,9 +54,17 @@ IMAGE=1panel/redis-cluster:8.10.3 bash checks/check-redis-cluster.sh `REDIS_EXTRA_FLAGS` 沿用原脚本按空白分词的行为,不执行 Shell 表达式,也不解释其中的 Shell 引号。针对当前应用包的 `--requirepass ${REDIS_PASSWORD}`,入口将整段密码作为单个参数处理,可保留空格、引号、反斜杠、美元符号等字符。其他带空白的参数值请通过配置文件或容器命令参数数组传入。 +## 日志 + +入口输出包含 UTC 时间、级别和环境变量角色的阶段日志,覆盖参数校验、目录准备、挂载配置或默认配置选择、复制参数设置和数据库启动。阶段日志不打印密码、完整命令、配置内容或 `REDIS_EXTRA_FLAGS` 的值。使用挂载配置时,实际复制角色仍由该配置和后续参数决定,日志中的角色不表示入口覆盖了配置。 + +默认生成配置使用 `logfile ""`,引擎的启动、数据加载和复制日志输出到标准输出,可通过 `docker logs <容器名>` 或面板容器日志查看。挂载配置或追加参数显式指定的 `logfile`、`loglevel` 保持原样;自定义日志文件需要对 UID `1001` 可写,且不会被入口转发到容器日志。 + +入口的启动阶段日志表示即将执行 Redis,不代表已经监听或完成主从同步。引擎的 `Ready to accept connections` 只表示已开始接收连接;复制链路及追平情况仍需结合 `INFO replication` 和从库新值确认。 + 本镜像只提供固定主从复制,不提供 Sentinel 自动选主、Redis Cluster 分片或主节点故障后的自动切换。替换镜像不会改变现有复制拓扑。升级应先在数据副本上验证同版本换镜像,再验证同系列补丁升级;8.0→8.10 属于跨系列升级,不能作为普通补丁更新。不要直接复用跨系列升级后写入的数据进行降级。6.2 使用单文件 AOF,7.4 和 8.10 使用多文件 AOF;配置文件和数据需要与目标系列匹配,不能将含 `appenddirname` 等新配置的 7.4、8.10 配置直接套给 6.2。 -验证脚本使用唯一名称创建容器、网络和数据卷,测试不同密码、非默认端口、连续写入、主节点重启持久化、从节点离线 AOF 恢复和重新连接,并根据镜像的 `REDIS_VERSION` 检查对应的单文件或多文件 AOF。复制就绪和重连通过轮询从库中的新值确认;脚本还通过 `CLIENT PAUSE WRITE` 制造受控复制延迟,先确认旧值仍可读取,再等待新值,避免将不同连接上的 `WAIT` 当作同步屏障。脚本仅清理本次创建的资源,不等同于旧 Bitnami 数据升级或真实多主机部署验证。 +验证脚本使用唯一名称创建容器、网络和数据卷,测试不同密码、非默认端口、连续写入、主节点重启持久化、从节点离线 AOF 恢复和重新连接,并根据镜像的 `REDIS_VERSION` 检查对应的单文件或多文件 AOF。按容器本次启动时间检查入口阶段、引擎接收连接日志及测试密码未出现在日志中,避免历史日志导致误通过。复制就绪和重连通过轮询从库中的新值确认;脚本还通过 `CLIENT PAUSE WRITE` 制造受控复制延迟,先确认旧值仍可读取,再等待新值,避免将不同连接上的 `WAIT` 当作同步屏障。脚本仅清理本次创建的资源,不等同于旧 Bitnami 数据升级或真实多主机部署验证。 8.10.3 已在本地 ARM64 原生和 AMD64 QEMU 环境通过基础主从、密码、持久化与重连测试。另在 ARM64 使用当前应用包 `8.0-master` 的原始配置和新生成的测试数据,验证了 8.10.3 启动、读写、`SAVE` 和 RDB 重启恢复;该结果仅说明配置兼容,不代表旧 8.0 数据迁移已验证。 diff --git a/database-ha/redis/docker-entrypoint.sh b/database-ha/redis/docker-entrypoint.sh index 4aa83a4..5174faa 100644 --- a/database-ha/redis/docker-entrypoint.sh +++ b/database-ha/redis/docker-entrypoint.sh @@ -6,33 +6,46 @@ if [[ "${1:-}" != "redis-server" ]]; then fi shift +log() { + local level="$1" + shift + printf '%s [%s] Redis cluster (%s): %s\n' "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" "$level" "${role:-startup}" "$*" >&2 +} + +fail() { + log ERROR "$*" + exit 1 +} + role="${REDIS_REPLICATION_MODE:-master}" +log INFO 'Validating replication settings' case "$role" in master) ;; slave) - : "${REDIS_MASTER_HOST:?REDIS_MASTER_HOST is required for a slave}" - : "${REDIS_MASTER_PASSWORD:?REDIS_MASTER_PASSWORD is required for a slave}" + [[ -n "${REDIS_MASTER_HOST:-}" ]] || fail 'REDIS_MASTER_HOST is required for a slave' + [[ -n "${REDIS_MASTER_PASSWORD:-}" ]] || fail 'REDIS_MASTER_PASSWORD is required for a slave' master_port="${REDIS_MASTER_PORT_NUMBER:-6379}" if [[ ! "$master_port" =~ ^[0-9]{1,5}$ ]] || (( 10#$master_port < 1 || 10#$master_port > 65535 )); then - printf '%s\n' 'REDIS_MASTER_PORT_NUMBER must be between 1 and 65535' >&2 - exit 1 + fail 'REDIS_MASTER_PORT_NUMBER must be between 1 and 65535' fi ;; *) - printf '%s\n' 'REDIS_REPLICATION_MODE must be master or slave' >&2 - exit 1 + fail 'REDIS_REPLICATION_MODE must be master or slave' ;; esac -: "${REDIS_PASSWORD:?REDIS_PASSWORD is required}" +[[ -n "${REDIS_PASSWORD:-}" ]] || fail 'REDIS_PASSWORD is required' umask 0077 config=/opt/bitnami/redis/etc/redis.conf +log INFO 'Preparing data and configuration directories' mkdir -p /bitnami/redis/data /opt/bitnami/redis/etc /opt/bitnami/redis/logs args=("$config") if [[ -f /opt/bitnami/redis/mounted-etc/redis.conf ]]; then + log INFO 'Using mounted Redis configuration; replication and persistence settings are preserved' cp /opt/bitnami/redis/mounted-etc/redis.conf "$config" else + log INFO 'Generating default Redis configuration with AOF enabled' cat > "$config" <<'EOF' bind 0.0.0.0 port 6379 @@ -46,13 +59,18 @@ save "" EOF args+=(--requirepass "$REDIS_PASSWORD") if [[ "$role" == slave ]]; then + log INFO 'Applying replica connection settings' args+=(--masterauth "$REDIS_MASTER_PASSWORD" --replicaof "$REDIS_MASTER_HOST" "$master_port") else + log INFO 'Applying primary authentication settings' args+=(--masterauth "$REDIS_PASSWORD") fi fi args+=(--daemonize no) +if [[ -n "${REDIS_EXTRA_FLAGS:-}" || "$#" != 0 ]]; then + log INFO 'Applying additional Redis arguments' +fi if [[ "${REDIS_EXTRA_FLAGS:-}" == "--requirepass $REDIS_PASSWORD" ]]; then args+=(--requirepass "$REDIS_PASSWORD") elif [[ -n "${REDIS_EXTRA_FLAGS:-}" ]]; then @@ -60,4 +78,5 @@ elif [[ -n "${REDIS_EXTRA_FLAGS:-}" ]]; then args+=("${extra_flags[@]}") fi +log INFO 'Starting Redis server' exec redis-server "${args[@]}" "$@"