Skip to content

Commit 28bba27

Browse files
committed
[KYUUBI #7205] Use Apache closer.lua syntax for kyuubi-download to obtain engine archives
### Why are the changes needed? Speed up download Spark, Flink, and Hive tarballs, for the latest versions. https://infra.apache.org/release-download-pages.html#download-scripts ### How was this patch tested? Observe GHA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #7205 from pan3793/closer-lua. Closes #7205 10ffa34 [Cheng Pan] Use Apache closer.lua syntax for kyuubi-download to obtain engine archives Authored-by: Cheng Pan <[email protected]> Signed-off-by: Cheng Pan <[email protected]>
1 parent d5468d0 commit 28bba27

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

.github/workflows/master.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ jobs:
6262
comment: 'normal'
6363
- java: 8
6464
spark: '3.5'
65-
spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.3.3 -Dspark.archive.name=spark-3.3.3-bin-hadoop3.tgz -Pzookeeper-3.6'
65+
spark-archive: '-Dspark.archive.mirror=https://www.apache.org/dyn/closer.lua/spark/spark-3.3.3 -Dspark.archive.name=spark-3.3.3-bin-hadoop3.tgz -Pzookeeper-3.6'
6666
exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.SparkLocalClusterTest'
6767
comment: 'verify-on-spark-3.3-binary'
6868
- java: 8
6969
spark: '3.5'
70-
spark-archive: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.4.3 -Dspark.archive.name=spark-3.4.3-bin-hadoop3.tgz -Pzookeeper-3.6'
70+
spark-archive: '-Dspark.archive.mirror=https://www.apache.org/dyn/closer.lua/spark/spark-3.4.3 -Dspark.archive.name=spark-3.4.3-bin-hadoop3.tgz -Pzookeeper-3.6'
7171
exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.SparkLocalClusterTest'
7272
comment: 'verify-on-spark-3.4-binary'
7373
- java: 17
7474
spark: '3.5'
75-
spark-archive: '-Pscala-2.13 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-4.0.1 -Dspark.archive.name=spark-4.0.1-bin-hadoop3.tgz'
75+
spark-archive: '-Pscala-2.13 -Dspark.archive.mirror=https://www.apache.org/dyn/closer.lua/spark/spark-4.0.1 -Dspark.archive.name=spark-4.0.1-bin-hadoop3.tgz'
7676
exclude-tags: '-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.SparkLocalClusterTest'
7777
comment: 'verify-on-spark-4.0-binary'
7878
env:
@@ -247,15 +247,15 @@ jobs:
247247
include:
248248
- java: 8
249249
flink: '1.20'
250-
flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.17.2 -Dflink.archive.name=flink-1.17.2-bin-scala_2.12.tgz'
250+
flink-archive: '-Dflink.archive.mirror=https://www.apache.org/dyn/closer.lua/flink/flink-1.17.2 -Dflink.archive.name=flink-1.17.2-bin-scala_2.12.tgz'
251251
comment: 'verify-on-flink-1.17-binary'
252252
- java: 8
253253
flink: '1.20'
254-
flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.18.1 -Dflink.archive.name=flink-1.18.1-bin-scala_2.12.tgz'
254+
flink-archive: '-Dflink.archive.mirror=https://www.apache.org/dyn/closer.lua/flink/flink-1.18.1 -Dflink.archive.name=flink-1.18.1-bin-scala_2.12.tgz'
255255
comment: 'verify-on-flink-1.18-binary'
256256
- java: 8
257257
flink: '1.20'
258-
flink-archive: '-Dflink.archive.mirror=https://archive.apache.org/dist/flink/flink-1.19.1 -Dflink.archive.name=flink-1.19.1-bin-scala_2.12.tgz'
258+
flink-archive: '-Dflink.archive.mirror=https://www.apache.org/dyn/closer.lua/flink/flink-1.19.1 -Dflink.archive.name=flink-1.19.1-bin-scala_2.12.tgz'
259259
comment: 'verify-on-flink-1.19-binary'
260260
steps:
261261
- uses: actions/checkout@v4
@@ -310,10 +310,10 @@ jobs:
310310
comment: [ "normal" ]
311311
include:
312312
- java: 8
313-
hive-archive: '-Dhive.archive.mirror=https://archive.apache.org/dist/hive/hive-2.3.10 -Dhive.archive.name=apache-hive-2.3.10-bin.tar.gz'
313+
hive-archive: '-Dhive.archive.mirror=https://www.apache.org/dyn/closer.lua/hive/hive-2.3.10 -Dhive.archive.name=apache-hive-2.3.10-bin.tar.gz'
314314
comment: 'verify-on-hive-2.3-binary'
315315
- java: 8
316-
hive-archive: '-Dhive.archive.mirror=https://github.com/pan3793/cdh-hive/releases/download/cdh6.3.2-release -Dhive.archive.name=apache-hive-2.1.1-cdh6.3.2-bin.tar.gz'
316+
hive-archive: '-Dhive.archive.mirror=https://github.com/pan3793/cdh-hive/releases/download/cdh6.3.2-release -Dhive.archive.name=apache-hive-2.1.1-cdh6.3.2-bin.tar.gz -Dhive.archive.query='
317317
comment: 'verify-on-hive-2.1-cdh6-binary'
318318
steps:
319319
- uses: actions/checkout@v4

docs/contributing/code/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ For the Scala version for Spark engines, the server will look up the `SPARK_SCAL
8282

8383
## Building With Apache dlcdn Site
8484

85-
By default, we use `https://archive.apache.org/dist/` to download the built-in release packages of engines,
85+
By default, we use [`closer.lua`](https://infra.apache.org/release-download-pages.html#download-scripts) to download the built-in release packages of engines,
8686
such as Spark or Flink.
8787
But sometimes, you may find it hard to reach, or the download speed is too slow,
8888
then you can define the `apache.archive.dist` by `-Pmirror-cdn` to accelerate to download speed.

externals/kyuubi-download/pom.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
<phase>compile</phase>
5252
<configuration>
5353
<skip>${spark.archive.download.skip}</skip>
54-
<url>${spark.archive.mirror}/${spark.archive.name}</url>
54+
<url>${spark.archive.mirror}/${spark.archive.name}${spark.archive.query}</url>
55+
<outputFileName>${spark.archive.name}</outputFileName>
5556
</configuration>
5657
</execution>
5758
<execution>
@@ -62,7 +63,8 @@
6263
<phase>compile</phase>
6364
<configuration>
6465
<skip>${flink.archive.download.skip}</skip>
65-
<url>${flink.archive.mirror}/${flink.archive.name}</url>
66+
<url>${flink.archive.mirror}/${flink.archive.name}${flink.archive.query}</url>
67+
<outputFileName>${flink.archive.name}</outputFileName>
6668
</configuration>
6769
</execution>
6870
<execution>
@@ -73,7 +75,8 @@
7375
<phase>compile</phase>
7476
<configuration>
7577
<skip>${hive.archive.download.skip}</skip>
76-
<url>${hive.archive.mirror}/${hive.archive.name}</url>
78+
<url>${hive.archive.mirror}/${hive.archive.name}${hive.archive.query}</url>
79+
<outputFileName>${hive.archive.name}</outputFileName>
7780
</configuration>
7881
</execution>
7982
</executions>

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<!-- Please don't upgrade the version to 4.10+, it depends on JDK 11 -->
127127
<antlr4.version>4.9.3</antlr4.version>
128128
<antlr.st4.version>4.3.4</antlr.st4.version>
129-
<apache.archive.dist>https://archive.apache.org/dist</apache.archive.dist>
129+
<apache.archive.dist>https://www.apache.org/dyn/closer.lua</apache.archive.dist>
130130
<atlas.version>2.3.0</atlas.version>
131131
<byte-buddy.version>1.17.6</byte-buddy.version>
132132
<bouncycastle.version>1.78</bouncycastle.version>
@@ -144,6 +144,7 @@
144144
<flink.version>1.20.0</flink.version>
145145
<flink.archive.name>flink-${flink.version}-bin-scala_2.12.tgz</flink.archive.name>
146146
<flink.archive.mirror>${apache.archive.dist}/flink/flink-${flink.version}</flink.archive.mirror>
147+
<flink.archive.query>?action=download</flink.archive.query>
147148
<flink.archive.download.skip>false</flink.archive.download.skip>
148149
<google.jsr305.version>3.0.2</google.jsr305.version>
149150
<grpc.version>1.65.1</grpc.version>
@@ -155,6 +156,7 @@
155156
<hive.version>3.1.3</hive.version>
156157
<hive.archive.name>apache-hive-${hive.version}-bin.tar.gz</hive.archive.name>
157158
<hive.archive.mirror>${apache.archive.dist}/hive/hive-${hive.version}</hive.archive.mirror>
159+
<hive.archive.query>?action=download</hive.archive.query>
158160
<hive.archive.download.skip>false</hive.archive.download.skip>
159161
<httpclient.version>4.5.14</httpclient.version>
160162
<httpcore.version>4.4.16</httpcore.version>
@@ -208,6 +210,7 @@
208210
<spark.archive.scala.suffix></spark.archive.scala.suffix>
209211
<spark.archive.name>spark-${spark.version}-bin-hadoop3${spark.archive.scala.suffix}.tgz</spark.archive.name>
210212
<spark.archive.mirror>${apache.archive.dist}/spark/spark-${spark.version}</spark.archive.mirror>
213+
<spark.archive.query>?action=download</spark.archive.query>
211214
<spark.archive.download.skip>false</spark.archive.download.skip>
212215
<sqlite.version>3.46.1.3</sqlite.version>
213216
<supercsv.version>2.2.0</supercsv.version>
@@ -1955,6 +1958,9 @@
19551958
<properties>
19561959
<!-- the apache cdn mirror works only for latest apache releases -->
19571960
<apache.archive.dist>https://dlcdn.apache.org</apache.archive.dist>
1961+
<spark.archive.query></spark.archive.query>
1962+
<flink.archive.query></flink.archive.query>
1963+
<hive.archive.query></hive.archive.query>
19581964
<nodeDownloadRoot>https://npmmirror.com/mirrors/node/</nodeDownloadRoot>
19591965
<pnpmDownloadRoot>https://registry.npmmirror.com/pnpm/-/</pnpmDownloadRoot>
19601966
</properties>

0 commit comments

Comments
 (0)