fix: fix "init" setup mode: ping_count, init bind address (#464)

* Increment the ping_count variable while waiting on the server to come up to prevent an infinite loop
* Ensure init port works even when INFLUXD_HTTP_BIND_ADDRESS is set in the env

Author: shua

influxdb/2.0/alpine/entrypoint.sh

@@ -169,8 +169,9 @@ function wait_for_influxd () {
             log info "got response from influxd, proceeding"
             return
         fi
+        ping_count=$((ping_count+1))
     done
-    log error "failed to detect influxd startup" ping_attempts ${STARTUP_PING_ATTEMPTS}
+    log error "failed to detect influxd startup" ping_attempts ${ping_count}
     exit 1
 }
 
@@ -237,18 +238,16 @@ function init_influxd () {
         upgrade_influxd
     fi
 
-    # Generate a config file with a known HTTP port
-    local -r init_config=/tmp/config.yml
+    # Capture final bind address, and check it is distinct from init addr
     local -r final_bind_addr="$(influxd print-config --key-name http-bind-address "${@}")"
     local -r init_bind_addr=":${INFLUXD_INIT_PORT}"
     if [ "${init_bind_addr}" = "${final_bind_addr}" ]; then
       log warn "influxd setup binding to same addr as final config, server will be exposed before ready" addr "${init_bind_addr}"
     fi
-    influxd print-config "${@}" | sed "s#${final_bind_addr}#${init_bind_addr}#" > ${init_config}
 
     # Start influxd in the background.
     log info "booting influxd server in the background"
-    INFLUXD_CONFIG_PATH=${init_config} influxd "${@}" &
+    INFLUXD_HTTP_BIND_ADDRESS="${init_bind_addr}" influxd "${@}" &
     local -r influxd_init_pid="$!"
     trap "handle_signal TERM ${influxd_init_pid}" TERM
     trap "handle_signal INT ${influxd_init_pid}" INT

influxdb/2.0/entrypoint.sh

@@ -169,8 +169,9 @@ function wait_for_influxd () {
             log info "got response from influxd, proceeding"
             return
         fi
+        ping_count=$((ping_count+1))
     done
-    log error "failed to detect influxd startup" ping_attempts ${STARTUP_PING_ATTEMPTS}
+    log error "failed to detect influxd startup" ping_attempts ${ping_count}
     exit 1
 }
 
@@ -237,18 +238,16 @@ function init_influxd () {
         upgrade_influxd
     fi
 
-    # Generate a config file with a known HTTP port
-    local -r init_config=/tmp/config.yml
+    # Capture final bind address, and check it is distinct from init addr
     local -r final_bind_addr="$(influxd print-config --key-name http-bind-address "${@}")"
     local -r init_bind_addr=":${INFLUXD_INIT_PORT}"
     if [ "${init_bind_addr}" = "${final_bind_addr}" ]; then
       log warn "influxd setup binding to same addr as final config, server will be exposed before ready" addr "${init_bind_addr}"
     fi
-    influxd print-config "${@}" | sed "s#${final_bind_addr}#${init_bind_addr}#" > ${init_config}
 
     # Start influxd in the background.
     log info "booting influxd server in the background"
-    INFLUXD_CONFIG_PATH=${init_config} influxd "${@}" &
+    INFLUXD_HTTP_BIND_ADDRESS="${init_bind_addr}" influxd "${@}" &
     local -r influxd_init_pid="$!"
     trap "handle_signal TERM ${influxd_init_pid}" TERM
     trap "handle_signal INT ${influxd_init_pid}" INT

influxdb/test/cases/test-auto-setup-init-bind

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+declare -r SCRIPT_DIR=$(cd $(dirname $0) >/dev/null 2>&1 && pwd)
+source ${SCRIPT_DIR}/common.sh
+
+declare -r tag=$1 container_name=$2 data=$3 config=$4 logs=$5
+
+declare -ra docker_run_influxd=(
+    docker run -i -d
+    --name=${container_name}
+    -u $(id -u):influxdb
+    -p 8086:3333
+    -v ${data}:/var/lib/influxdb2
+    -v ${config}:/etc/influxdb2
+    -e DOCKER_INFLUXDB_INIT_MODE=setup
+    -e DOCKER_INFLUXDB_INIT_USERNAME=${TEST_USER}
+    -e DOCKER_INFLUXDB_INIT_PASSWORD=${TEST_PASSWORD}
+    -e DOCKER_INFLUXDB_INIT_ORG=${TEST_ORG}
+    -e DOCKER_INFLUXDB_INIT_BUCKET=${TEST_BUCKET}
+    -e INFLUXD_HTTP_BIND_ADDRESS=:3333
+    -e INFLUXD_INIT_PORT=9998
+    influxdb:${tag} influxd run
+)
+
+# Boot the container
+log_msg Booting 2.x container in setup mode
+if ! ${docker_run_influxd[@]} > /dev/null; then
+    log_msg Error: Failed to launch container
+    exit 1
+fi
+wait_container_ready
+
+# Destroy the container
+log_msg Tearing down 2.x container
+docker stop ${container_name} > /dev/null
+docker logs ${container_name} > ${logs}/init-docker-stdout.log 2> ${logs}/init-docker-stderr.log
+docker rm ${container_name} > /dev/null
+
+# Check that setup actually used INFLUXD_INIT_PORT
+log_has () {
+    grep "$2" ${logs}/init-docker-"$1".log > /dev/null
+}
+if ! log_has stdout 'msg=Listening.*transport=http addr=:9998 port=9998'; then
+    log_msg Error: container did not use INFLUXD_INIT_PORT
+    exit 1
+fi
+if ! log_has stderr 'got response from influxd, proceeding'; then
+    log_msg Error: init ping never completed successfully
+    exit 1
+fi