fix: stabilize im server startup and p2p topic scans

2026-08-24 16:20:02 +08:00
parent e61058ec03
commit 07376c70e3
8 changed files with 124 additions and 30 deletions
@@ -113,27 +113,59 @@ if [ ! -z "$WAIT_FOR" ] ; then
 	until nc -z -v -w5 ${DB[0]} ${DB[1]}; do echo "waiting for ${WAIT_FOR}..."; sleep 3; done
 fi

-# Initialize the database if it has not been initialized yet or if data reset/upgrade has been requested.
-init_stdout=./init-db-stdout.txt
-./init-db \
-	--reset=${RESET_DB} \
-	--upgrade=${UPGRADE_DB} \
-	--config=${CONFIG} \
-	--data=${SAMPLE_DATA} \
-	--no_init=${NO_DB_INIT} \
-	1>${init_stdout}
-if [ $? -ne 0 ]; then
-	echo "./init-db failed. Quitting."
-	exit 1
-fi
+run_with_retries() {
+	local name="$1"
+	shift
+	local attempts="${STARTUP_RETRY_ATTEMPTS:-10}"
+	local delay="${STARTUP_RETRY_DELAY_SECONDS:-3}"
+	local i=1
+	while [ "$i" -le "$attempts" ]; do
+		"$@"
+		local status=$?
+		if [ "$status" -eq 0 ]; then
+			return 0
+		fi
+		echo "$name failed with status $status (attempt $i/$attempts)."
+		if [ "$i" -eq "$attempts" ]; then
+			return "$status"
+		fi
+		sleep "$delay"
+		i=$((i + 1))
+	done
+}

-# Create/upgrade the hotgo tenant registry and the workbench/org/meetings/
-# reports/mailbox/etc. tables that init-db above does not manage. Idempotent
-# (IF NOT EXISTS / ON DUPLICATE KEY UPDATE throughout), safe to run every start.
-IM_MYSQL_DSN="${MYSQL_DSN}" ./apply-hotgo-tenant-db
-if [ $? -ne 0 ]; then
-	echo "./apply-hotgo-tenant-db failed. Quitting."
-	exit 1
+init_db_once() {
+	./init-db \
+		--reset=${RESET_DB} \
+		--upgrade=${UPGRADE_DB} \
+		--config=${CONFIG} \
+		--data=${SAMPLE_DATA} \
+		--no_init=${NO_DB_INIT} \
+		1>${init_stdout}
+}
+
+apply_hotgo_tenant_db_once() {
+	IM_MYSQL_DSN="${MYSQL_DSN}" ./apply-hotgo-tenant-db
+}
+
+init_stdout=./init-db-stdout.txt
+if [ "$NO_DB_INIT" = "true" ] ; then
+	echo "NO_DB_INIT=true: skipping init-db and apply-hotgo-tenant-db."
+else
+	# Initialize the database if it has not been initialized yet or if data reset/upgrade has been requested.
+	run_with_retries "init-db" init_db_once
+	if [ $? -ne 0 ]; then
+		echo "./init-db failed. Quitting."
+		exit 1
+	fi
+
+	# Create/upgrade the hotgo tenant registry and the workbench/org/meetings/
+	# reports/mailbox/etc. tables that init-db above does not manage.
+	run_with_retries "apply-hotgo-tenant-db" apply_hotgo_tenant_db_once
+	if [ $? -ne 0 ]; then
+		echo "./apply-hotgo-tenant-db failed. Quitting."
+		exit 1
+	fi
 fi

 # If sample data was provided, try to find Tino password.