Skip to content

Commit 005364e

Browse files
hmottestadhmottestad
authored
Merge main into develop (#5635)
2 parents 3bbede6 + 07af6fd commit 005364e

93 files changed

Lines changed: 422 additions & 315 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/thread-dump-post/action.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: Thread dump on cancellation
2+
description: Capture JVM thread dumps after a job is cancelled.
3+
runs:
4+
using: node20
5+
main: main.js
6+
post: post.js
7+
post-if: cancelled()

‎.github/actions/thread-dump-post/main.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log("Thread dump post-step registered.");

‎.github/actions/thread-dump-post/post.js‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
const { execSync } = require("child_process");
2+
3+
function run(command) {
4+
execSync(command, { stdio: "inherit", shell: "/bin/bash" });
5+
}
6+
7+
function dumpThreads() {
8+
run('echo "== Cancellation detected: capturing JVM thread dumps =="');
9+
run(
10+
[
11+
"set -euo pipefail",
12+
"pids=$(pgrep -f '[j]ava' || true)",
13+
'if [[ -z "${pids}" ]]; then echo "No Java processes found."; exit 0; fi',
14+
"if command -v jcmd >/dev/null 2>&1; then",
15+
" for pid in ${pids}; do",
16+
' echo "-- jcmd Thread.print for PID ${pid} --"',
17+
" jcmd \"${pid}\" Thread.print || true",
18+
" done",
19+
" exit 0",
20+
"fi",
21+
"if command -v jstack >/dev/null 2>&1; then",
22+
" for pid in ${pids}; do",
23+
' echo "-- jstack for PID ${pid} --"',
24+
" jstack \"${pid}\" || true",
25+
" done",
26+
" exit 0",
27+
"fi",
28+
"for pid in ${pids}; do",
29+
' echo "-- kill -QUIT ${pid} (no jcmd/jstack available) --"',
30+
" kill -QUIT \"${pid}\" || true",
31+
"done",
32+
].join("\n")
33+
);
34+
}
35+
36+
try {
37+
dumpThreads();
38+
} catch (error) {
39+
console.error("Thread dump post-step failed:", error);
40+
}

‎.github/workflows/develop-status.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v4
18+
- name: Register JVM thread dump on cancel
19+
uses: ./.github/actions/thread-dump-post
1820
- name: Set up JDK
1921
uses: actions/setup-java@v1
2022
with:
@@ -29,7 +31,7 @@ jobs:
2931
- name: Build
3032
run: mvn -B -U clean install -Pquick,\!formatting
3133
- name: Verify
32-
run: ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
34+
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
3335
- name: Publish Test Report
3436
if: failure()
3537
uses: scacap/action-surefire-report@v1

‎.github/workflows/main-status.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v4
18+
- name: Register JVM thread dump on cancel
19+
uses: ./.github/actions/thread-dump-post
1820
- name: Set up JDK
1921
uses: actions/setup-java@v1
2022
with:
@@ -29,7 +31,7 @@ jobs:
2931
- name: Build
3032
run: mvn -B -U -T 2C clean install -DskipTests
3133
- name: Run all tests
32-
run: ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
34+
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B install -P-skipSlowTests -Dmaven.javadoc.skip=true
3335
- name: Publish Test Report
3436
if: failure()
3537
uses: scacap/action-surefire-report@v1

‎.github/workflows/pr-verify.yml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19+
- name: Register JVM thread dump on cancel
20+
uses: ./.github/actions/thread-dump-post
1921
- name: Set up JDK
2022
uses: actions/setup-java@v4
2123
with:
2224
java-version: 11
2325
distribution: 'temurin'
2426
cache: maven
2527
- name: Check formatting
26-
run: mvn -B --quiet -T 2C formatter:validate impsort:check xml-format:xml-check
28+
run: mvn -B -Pformatting spotless:check
2729
- name: Quick compile
2830
run: mvn -B --quiet -T 2C compile -DskipTests -Pquick
2931
- name: Download all other dependencies
@@ -34,6 +36,8 @@ jobs:
3436
runs-on: ubuntu-latest
3537
steps:
3638
- uses: actions/checkout@v4
39+
- name: Register JVM thread dump on cancel
40+
uses: ./.github/actions/thread-dump-post
3741
- name: Set up JDK
3842
uses: actions/setup-java@v4
3943
with:
@@ -53,6 +57,8 @@ jobs:
5357
jdk: [ 11, 25 ]
5458
steps:
5559
- uses: actions/checkout@v4
60+
- name: Register JVM thread dump on cancel
61+
uses: ./.github/actions/thread-dump-post
5662
- name: Set up JDK
5763
uses: actions/setup-java@v4
5864
with:
@@ -62,7 +68,7 @@ jobs:
6268
- name: Build
6369
run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
6470
- name: Test
65-
run: ./scripts/ci/run-with-thread-dump.sh mvn -B test -DskipITs -P-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
71+
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B test -DskipITs -P-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
6672
- name: Publish Test Report
6773
if: failure()
6874
uses: scacap/action-surefire-report@v1.9.0
@@ -75,6 +81,8 @@ jobs:
7581
runs-on: ubuntu-latest
7682
steps:
7783
- uses: actions/checkout@v4
84+
- name: Register JVM thread dump on cancel
85+
uses: ./.github/actions/thread-dump-post
7886
- name: Set up JDK
7987
uses: actions/setup-java@v4
8088
with:
@@ -84,7 +92,7 @@ jobs:
8492
- name: Build
8593
run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
8694
- name: Verify
87-
run: ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip
95+
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip
8896
- name: Publish Test Report
8997
if: failure()
9098
uses: scacap/action-surefire-report@v1.9.0
@@ -96,6 +104,8 @@ jobs:
96104
runs-on: ubuntu-latest
97105
steps:
98106
- uses: actions/checkout@v4
107+
- name: Register JVM thread dump on cancel
108+
uses: ./.github/actions/thread-dump-post
99109
- name: Set up JDK
100110
uses: actions/setup-java@v4
101111
with:
@@ -105,7 +115,7 @@ jobs:
105115
- name: Build
106116
run: mvn --quiet clean && mvn -B --quiet -T 2C install -Pquick
107117
- name: Verify
108-
run: ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
118+
run: exec ./scripts/ci/run-with-thread-dump.sh mvn -B verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip
109119
- name: Publish Test Report
110120
if: failure()
111121
uses: scacap/action-surefire-report@v1.9.0
@@ -117,6 +127,8 @@ jobs:
117127
runs-on: ubuntu-latest
118128
steps:
119129
- uses: actions/checkout@v4
130+
- name: Register JVM thread dump on cancel
131+
uses: ./.github/actions/thread-dump-post
120132
- name: Set up JDK
121133
uses: actions/setup-java@v4
122134
with:
@@ -134,6 +146,8 @@ jobs:
134146
runs-on: ubuntu-latest
135147
steps:
136148
- uses: actions/checkout@v4
149+
- name: Register JVM thread dump on cancel
150+
uses: ./.github/actions/thread-dump-post
137151
- name: Set up JDK
138152
uses: actions/setup-java@v4
139153
with:
@@ -148,11 +162,13 @@ jobs:
148162
node-version: 18
149163
- name: Run end-to-end tests of RDF4J Server and Workbench
150164
working-directory: ./e2e
151-
run: ../scripts/ci/run-with-thread-dump.sh ./run.sh
165+
run: exec ../scripts/ci/run-with-thread-dump.sh ./run.sh
152166

153167
copyright-check:
154168
runs-on: ubuntu-latest
155169
steps:
156170
- uses: actions/checkout@v4
171+
- name: Register JVM thread dump on cancel
172+
uses: ./.github/actions/thread-dump-post
157173
- name: check copyright header present
158174
run: scripts/checkCopyrightPresent.sh

‎assembly/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<createDependencyReducedPom>false</createDependencyReducedPom>
9191
<shadedArtifactAttached>false</shadedArtifactAttached>
9292
<transformers>
93-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
93+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
9494
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
9595
<resource>edl-v1.0.txt</resource>
9696
<file>../edl-v1.0.txt</file>

‎assembly/src/main/assembly/sdk.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<fileSets>
1616
<fileSet>
1717
<directory>..</directory>
18-
<outputDirectory/>
18+
<outputDirectory />
1919
<includes>
2020
<include>*.txt</include>
2121
</includes>
@@ -49,15 +49,15 @@
4949
</file>
5050
<file>
5151
<source>../edl-v1.0.txt</source>
52-
<outputDirectory/>
52+
<outputDirectory />
5353
</file>
5454
<file>
5555
<source>../about.md</source>
56-
<outputDirectory/>
56+
<outputDirectory />
5757
</file>
5858
<file>
5959
<source>../notice.md</source>
60-
<outputDirectory/>
60+
<outputDirectory />
6161
</file>
6262
</files>
6363
</assembly>

‎compliance/elasticsearch/src/test/resources/logback-test.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
</encoder>
77
</appender>
88
<logger name="org.eclipse.rdf4j.sail.elasticsearch.ElasticsearchSailTest">
9-
<level value="warn"/>
9+
<level value="warn" />
1010
</logger>
1111
<logger name="org.eclipse.rdf4j.sail.lucene.AbstractLuceneSailSpinTest">
12-
<level value="info"/>
12+
<level value="info" />
1313
</logger>
1414
<logger name="org.eclipse.rdf4j.sail.lucene.AbstractLuceneSailTupleFunctionTest">
15-
<level value="warn"/>
15+
<level value="warn" />
1616
</logger>
1717
<root>
18-
<level value="warn"/>
19-
<appender-ref ref="STDOUT"/>
18+
<level value="warn" />
19+
<appender-ref ref="STDOUT" />
2020
</root>
2121
</configuration>

‎compliance/repository/src/test/resources/logback-test.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %msg%n</pattern>
66
</encoder>
77
</appender>
8-
<logger name="org.eclipse.rdf4j" level="info"/>
8+
<logger name="org.eclipse.rdf4j" level="info" />
99
<root>
10-
<level value="warn"/>
11-
<appender-ref ref="STDOUT"/>
10+
<level value="warn" />
11+
<appender-ref ref="STDOUT" />
1212
</root>
1313
</configuration>

0 commit comments

Comments
 (0)