Skip to content

Commit 6f5acc8

Browse files
Revert back to Spark 3.3.2
1 parent 7831323 commit 6f5acc8

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"ghcr.io/devcontainers/features/azure-cli:1": {},
3636
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
3737
"ghcr.io/devcontainers/features/terraform:1": {},
38-
"ghcr.io/devcontainers-contrib/features/spark-sdkman:2": { "version": "3.4.0"}
38+
"ghcr.io/devcontainers-contrib/features/spark-sdkman:2": { "version": "3.3.2"}
3939
},
4040
"postCreateCommand": "sudo pip3 install -r src/requirements.txt"
4141
}

src/databricks.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ provider "databricks" {
1111
azure_workspace_resource_id = azurerm_databricks_workspace.dbw.id
1212
}
1313

14-
data "databricks_spark_version" "latest" {
15-
depends_on = [azurerm_databricks_workspace.dbw]
14+
data "databricks_spark_version" "v332" {
15+
spark_version = "3.3.2"
16+
depends_on = [azurerm_databricks_workspace.dbw]
1617
}
1718

1819
data "databricks_node_type" "smallest" {
@@ -68,7 +69,7 @@ resource "databricks_secret" "dbpassword" {
6869

6970
resource "databricks_cluster" "this" {
7071
cluster_name = "Exploration Cluster"
71-
spark_version = data.databricks_spark_version.latest.id
72+
spark_version = data.databricks_spark_version.v332.id
7273
node_type_id = data.databricks_node_type.smallest.id
7374
autotermination_minutes = 20
7475
autoscale {
@@ -96,7 +97,7 @@ resource "databricks_library" "wheel" {
9697
resource "databricks_library" "kafka" {
9798
cluster_id = databricks_cluster.this.id
9899
maven {
99-
coordinates = "org.apache.spark:spark-sql-kafka-0-10_2.12:3.4.0"
100+
coordinates = "org.apache.spark:spark-sql-kafka-0-10_2.12:3.3.2"
100101
}
101102
}
102103

src/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ services:
5050
# Explicitly delete Wheel before building in order to avoid picking up existing version from mount
5151
entrypoint: ["bash", "-c", "rm -rf /common_lib/dist/*.whl && pip install build && python -m build /common_lib"]
5252
spark:
53-
image: apache/spark-py:v3.4.0
53+
image: apache/spark-py:v3.3.2
5454
ports:
5555
- 4040:4040
5656
volumes:
@@ -74,7 +74,7 @@ services:
7474
# The mssql-jdbc package must be explicitly added https://stackoverflow.com/questions/66903523/apache-spark-connector-for-sql-server-and-azure-sql
7575
# The default Ivy Cache location is not writable in the container, hence we have to override it to /tmp https://stackoverflow.com/a/69559038
7676
command: ["/opt/spark/bin/spark-submit", "--packages",
77-
"org.apache.spark:spark-sql-kafka-0-10_2.12:3.4.0,com.microsoft.azure:spark-mssql-connector_2.12:1.3.0-BETA,com.microsoft.sqlserver:mssql-jdbc:12.4.0.jre8",
77+
"org.apache.spark:spark-sql-kafka-0-10_2.12:3.3.2,com.microsoft.azure:spark-mssql-connector_2.12:1.3.0-BETA,com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8",
7878
"--conf", "spark.driver.extraJavaOptions=-Divy.cache.dir=/tmp -Divy.home=/tmp",
7979
"--conf", "spark.ui.prometheus.enabled=true",
8080
"--conf", "spark.executor.processTreeMetrics.enabled=true",

src/grafana/dashboards/spark_performance.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275
"sortBy": [
276276
{
277277
"desc": false,
278-
"displayName": "{__name__=\"spark_info\", instance=\"spark:4040\", job=\"Spark Executors Metrics\", revision=\"87a5442f7ed96b11051d8a9333476d080054e5a0\", version=\"3.4.0\"}"
278+
"displayName": "{__name__=\"spark_info\", instance=\"spark:4040\", job=\"Spark Executors Metrics\", revision=\"5103e00c4ce5fcc4264ca9c4df12295d42557af6\", version=\"3.3.2\"}"
279279
}
280280
]
281281
},

src/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
build
22
flake8
3-
pyspark==3.4.0
3+
pyspark==3.3.2
44
pytest
55
pytest-github-report
66
setuptools

0 commit comments

Comments
 (0)