Skip to content

Commit c6fb383

Browse files
authored
Restart connect server until port is open (#270)
1 parent 979a28d commit c6fb383

File tree

1 file changed

+20
-3
lines changed

1 file changed

+20
-3
lines changed

.github/actions/test-python/action.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,24 @@ runs:
139139
- name: Start Spark Connect
140140
id: spark-connect
141141
if: (inputs.spark-compat-version == '3.4' || inputs.spark-compat-version == '3.5' || startsWith('4.', inputs.spark-compat-version)) && inputs.scala-compat-version == '2.12' && ! contains(inputs.spark-version, '-SNAPSHOT')
142+
env:
143+
SPARK_HOME: ${{ env.SPARK_BIN_HOME }}
142144
run: |
143-
$SPARK_BIN_HOME/sbin/start-connect-server.sh --packages org.apache.spark:spark-connect_${{ inputs.scala-compat-version }}:${{ inputs.spark-version }}
145+
while true; do
146+
$SPARK_HOME/sbin/start-connect-server.sh --packages org.apache.spark:spark-connect_${{ inputs.scala-compat-version }}:${{ inputs.spark-version }}
147+
sleep 10
148+
for log in $SPARK_HOME/logs/spark-*-org.apache.spark.sql.connect.service.SparkConnectServer-*.out*; do
149+
echo "::group::Spark Connect server log: $log"
150+
cat "$log" || true
151+
echo "::endgroup::"
152+
done
153+
154+
if netstat -an | grep 15002; then
155+
break;
156+
fi
157+
$SPARK_HOME/sbin/stop-connect-server.sh --packages org.apache.spark:spark-connect_${{ inputs.scala-compat-version }}:${{ inputs.spark-version }}
158+
sleep 5
159+
done
144160
shell: bash
145161

146162
- name: Python Unit Tests (Spark Connect)
@@ -155,10 +171,11 @@ runs:
155171

156172
- name: Stop Spark Connect
157173
if: always() && steps.spark-connect.outcome == 'success'
174+
env:
175+
SPARK_HOME: ${{ env.SPARK_BIN_HOME }}
158176
run: |
159-
$SPARK_BIN_HOME/sbin/stop-connect-server.sh
177+
$SPARK_HOME/sbin/stop-connect-server.sh
160178
echo "::group::Spark Connect server log"
161-
# thoughs started in $SPARK_BIN_HOME/sbin, logs go to $SPARK_HOME/logs
162179
ls -lah $SPARK_HOME/logs || true
163180
cat $SPARK_HOME/logs/spark-*-org.apache.spark.sql.connect.service.SparkConnectServer-*.out || true
164181
echo "::endgroup::"

0 commit comments

Comments
 (0)