Skip to content

Commit 5bccdfc

Browse files
authored
[PRA-256] Set driver metrics sink to JmxSink for shell entrypoints (#159) (#161)
* fix: Use JmxSink to avoid crashes in shells with COS * fix: Remove unneeded openjdk build package (already in stage) * ci: Update jira sync configuration * ci: Harden CI with 'contents: read' default permissions * ci: Remove duplicated permission in release.yaml
1 parent a79bc81 commit 5bccdfc

5 files changed

Lines changed: 32 additions & 26 deletions

File tree

.github/.jira_sync_config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ settings:
1313
closed: done # GitHub issue closed as completed
1414
not_planned: rejected # GitHub issue closed as not planned
1515
add_gh_comment: true
16-
sync_description: false
17-
sync_comments: false
16+
sync_description: true
17+
sync_comments: true

.github/workflows/ci.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
name: Build snap and run tests
22

3+
concurrency:
4+
group: ${{ github.workflow }}-${{ github.ref }}
5+
cancel-in-progress: true
6+
37
on:
4-
workflow_call:
5-
outputs:
6-
snap-file:
7-
description: "The snap output of build process."
8-
value: ${{ jobs.build.outputs.snap-file }}
8+
pull_request:
9+
10+
permissions:
11+
contents: read
912

1013
jobs:
1114
build:
1215
name: Build snap
1316
uses: canonical/data-platform-workflows/.github/workflows/build_snap.yaml@v48.0.2
17+
permissions:
18+
actions: read
19+
contents: read
1420

1521
test:
1622
name: "Tests (arch: ${{ matrix.system.arch }}, k8s: ${{ matrix.k8s_version }})"

.github/workflows/on_pull_request.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/release.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
- 3.5/*
88
- 4.0/*
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
release_checks:
1215
runs-on: ubuntu-22.04
@@ -40,6 +43,9 @@ jobs:
4043
build:
4144
name: Build snap
4245
uses: canonical/data-platform-workflows/.github/workflows/build_snap.yaml@v48.0.2
46+
permissions:
47+
actions: read
48+
contents: read
4349

4450
release:
4551
name: Release snap
@@ -53,5 +59,5 @@ jobs:
5359
secrets:
5460
snap-store-token: ${{ secrets.SNAP_STORE_TOKEN }}
5561
permissions:
56-
actions: read # Needed for GitHub API call to get workflow version
62+
actions: read
5763
contents: write # Needed to create GitHub release

snap/snapcraft.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ apps:
5757
spark-shell:
5858
command: etc/spark8t/launcher.sh $SNAP/bin/spark-shell $SPARK8T_EXTRA_CONF
5959
environment:
60-
SPARK8T_EXTRA_CONF: --conf spark.driver.extraJavaOptions="-Duser.home=$SNAP_USER_DATA" --conf spark.jars.ivy=/tmp
60+
SPARK8T_EXTRA_CONF: |
61+
--conf spark.driver.extraJavaOptions="-Duser.home=$SNAP_USER_DATA" \
62+
--conf spark.jars.ivy=/tmp \
63+
--conf spark.metrics.conf.driver.sink.prometheus.class=org.apache.spark.metrics.sink.JmxSink
6164
_JAVA_OPTIONS: "-Duser.home=$SNAP_USER_DATA -Djavax.net.ssl.trustStore=$SNAP_DATA/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStorePassword=changeit"
6265
plugs:
6366
- network
@@ -67,7 +70,10 @@ apps:
6770
pyspark:
6871
command: etc/spark8t/launcher.sh $SNAP/bin/pyspark $SPARK8T_EXTRA_CONF
6972
environment:
70-
SPARK8T_EXTRA_CONF: --conf spark.driver.extraJavaOptions="-Duser.home=$SNAP_USER_DATA" --conf spark.jars.ivy=/tmp
73+
SPARK8T_EXTRA_CONF: |
74+
--conf spark.driver.extraJavaOptions="-Duser.home=$SNAP_USER_DATA" \
75+
--conf spark.jars.ivy=/tmp \
76+
--conf spark.metrics.conf.driver.sink.prometheus.class=org.apache.spark.metrics.sink.JmxSink
7177
_JAVA_OPTIONS: "-Duser.home=$SNAP_USER_DATA -Djavax.net.ssl.trustStore=$SNAP_DATA/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStorePassword=changeit"
7278
plugs:
7379
- network
@@ -77,7 +83,10 @@ apps:
7783
spark-sql:
7884
command: etc/spark8t/launcher.sh $SNAP/bin/spark-sql $SPARK8T_EXTRA_CONF
7985
environment:
80-
SPARK8T_EXTRA_CONF: --conf spark.driver.extraJavaOptions="-Duser.home=$SNAP_USER_DATA" --conf spark.jars.ivy=/tmp
86+
SPARK8T_EXTRA_CONF: |
87+
--conf spark.driver.extraJavaOptions="-Duser.home=$SNAP_USER_DATA" \
88+
--conf spark.jars.ivy=/tmp \
89+
--conf spark.metrics.conf.driver.sink.prometheus.class=org.apache.spark.metrics.sink.JmxSink
8190
_JAVA_OPTIONS: "-Duser.home=$SNAP_USER_DATA -Djavax.net.ssl.trustStore=$SNAP_DATA/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStorePassword=changeit"
8291
plugs:
8392
- network
@@ -121,7 +130,6 @@ parts:
121130
build-packages:
122131
- ca-certificates
123132
- ca-certificates-java
124-
- openjdk-17-jre-headless
125133
- wget
126134
stage-packages:
127135
- openjdk-17-jre-headless

0 commit comments

Comments
 (0)