fix: ARM64 compatibility in wait-storage.sh - use curl instead of gremlin-console

Author: bitflicker64

docker/docker-compose.yml

@@ -43,7 +43,6 @@ services:
       HG_PD_RAFT_PEERS_LIST: pd:8610
       HG_PD_INITIAL_STORE_LIST: store:8500
       HG_PD_DATA_PATH: /hugegraph-pd/pd_data
-#      HG_PD_INITIAL_STORE_COUNT: "1"
     ports:
       - "8620:8620"
       - "8686:8686"
@@ -54,6 +53,7 @@ services:
       interval: 10s
       timeout: 5s
       retries: 12
+      start_period: 20s
 
   store:
     build:
@@ -68,7 +68,6 @@ services:
       pd:
         condition: service_healthy
     environment:
-      environment:
       HG_STORE_PD_ADDRESS: pd:8686
       HG_STORE_GRPC_HOST: store
       HG_STORE_GRPC_PORT: "8500"
@@ -82,10 +81,11 @@ services:
     volumes:
       - hg-store-data:/hugegraph-store/storage
     healthcheck:
-      test: ["CMD-SHELL", "curl -fsS http://localhost:8520/v1/health >/dev/null || exit 1"]
+      test: ["CMD-SHELL", "curl -fsS http://localhost:8520/v1/health >/dev/null && curl -fsS http://pd:8620/v1/health >/dev/null || exit 1"]
       interval: 10s
-      timeout: 5s
-      retries: 12
+      timeout: 10s
+      retries: 30
+      start_period: 30s
 
   server:
     build:
@@ -109,4 +109,5 @@ services:
       test: ["CMD-SHELL", "curl -fsS http://localhost:8080/versions >/dev/null || exit 1"]
       interval: 10s
       timeout: 5s
-      retries: 20
+      retries: 30
+      start_period: 60s

hugegraph-pd/hg-pd-dist/docker/docker-entrypoint.sh

@@ -67,8 +67,7 @@ SPRING_APPLICATION_JSON="$(cat <<JSON
   "raft":   { "address":    "$(json_escape "${HG_PD_RAFT_ADDRESS}")",
               "peers-list": "$(json_escape "${HG_PD_RAFT_PEERS_LIST}")" },
   "pd":     { "data-path":          "$(json_escape "${HG_PD_DATA_PATH}")",
-              "initial-store-list": "$(json_escape "${HG_PD_INITIAL_STORE_LIST}")"
-              "initial-store-count": "$(json_escape "${HG_PD_INITIAL_STORE_COUNT}")" }
+              "initial-store-list": "$(json_escape "${HG_PD_INITIAL_STORE_LIST}")" }
 }
 JSON
 )"

hugegraph-server/hugegraph-dist/src/assembly/static/bin/wait-storage.sh

@@ -29,7 +29,7 @@ function abs_path() {
 BIN=$(abs_path)
 TOP="$(cd "$BIN"/../ && pwd)"
 GRAPH_CONF="$TOP/conf/graphs/hugegraph.properties"
-WAIT_STORAGE_TIMEOUT_S=120
+WAIT_STORAGE_TIMEOUT_S=300
 DETECT_STORAGE="$TOP/scripts/detect-storage.groovy"
 
 . "$BIN"/util.sh
@@ -70,7 +70,28 @@ done < <(env | sort -r | awk -F= '{ st = index($0, "="); print $1 " " substr($0,
 # wait for storage
 if env | grep '^hugegraph\.' > /dev/null; then
     if [ -n "${WAIT_STORAGE_TIMEOUT_S:-}" ]; then
-        timeout "${WAIT_STORAGE_TIMEOUT_S}s" bash -c \
-        "until bin/gremlin-console.sh -- -e $DETECT_STORAGE > /dev/null 2>&1; do echo \"Hugegraph server are waiting for storage backend...\"; sleep 5; done"
+        # Extract pd.peers from config or environment
+        PD_PEERS="${hugegraph_pd_peers:-}"
+        if [ -z "$PD_PEERS" ]; then
+            PD_PEERS=$(grep -E "^\s*pd\.peers\s*=" "$GRAPH_CONF" | sed 's/.*=\s*//' | tr -d ' ')
+        fi
+
+        if [ -n "$PD_PEERS" ]; then
+            # Convert gRPC address to REST address (8686 -> 8620)
+            PD_REST=$(echo "$PD_PEERS" | sed 's/:8686/:8620/g' | cut -d',' -f1)
+            echo "Waiting for PD REST endpoint at $PD_REST..."
+
+            timeout "${WAIT_STORAGE_TIMEOUT_S}s" bash -c "
+                until curl -fsS http://${PD_REST}/v1/health >/dev/null 2>&1; do
+                    echo 'Hugegraph server are waiting for storage backend...'
+                    sleep 5
+                done
+                echo 'PD is reachable, waiting extra 10s for store registration...'
+                sleep 10
+                echo 'Storage backend is ready!'
+            " || echo "Warning: Timeout waiting for storage, proceeding anyway..."
+        else
+            echo "No pd.peers configured, skipping storage wait..."
+        fi
     fi
 fi