Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BACKLOG-22448 Added a better check for the presence of graalvm #151

Merged
merged 14 commits into from
Jul 11, 2024
Merged

BACKLOG-22448 Added a better check for the presence of graalvm #151

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
14e2d66
Added a better check for the presence of graalvm
Fgerthoffert Jul 8, 2024
2bb5c82
Fix following feedback
Fgerthoffert Jul 8, 2024
48a5bf8
Fixed detection of javascript engine
Fgerthoffert Jul 8, 2024
77785c4
Log all probes not returning green for the very first test executed o…
Fgerthoffert Jul 9, 2024
6794dd6
Fixed linting
Fgerthoffert Jul 9, 2024
4e7e88d
Added logs
Fgerthoffert Jul 9, 2024
e3562ac
Fixed linting
Fgerthoffert Jul 9, 2024
b03e9e1
Added an initial test on SAM status
Fgerthoffert Jul 10, 2024
1f950ab
Improved test
Fgerthoffert Jul 10, 2024
fe56f66
Tweaked tests
Fgerthoffert Jul 10, 2024
b61ea27
Fixed typo
Fgerthoffert Jul 10, 2024
e55638b
Merge branch 'main' into BACKLOG-22448c
Fgerthoffert Jul 10, 2024
27b8218
Downgraded jahia-cypress version
Fgerthoffert Jul 10, 2024
56304fd
Updated jahia-cypress version
Fgerthoffert Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/main/java/org/jahia/modules/sam/healthcheck/probes/SupportedStackJSModulesProbe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,21 @@ public ProbeStatus getStatus() {

String vmVendor = System.getProperty("java.vm.vendor", "Unknown");
Version jvmVersion = new Version(System.getProperty("java.version", "Unknown"));
Version graalVMVersion = new Version(System.getProperty("org.graalvm.version", "Unknown"));

// This probe is only relevant for Jahia 8.2.0.0+ in which npm-modules-engine is available.
// Not testing Jahia version since it is not to be backported to older versions of SAM.
ProbeStatus status = new ProbeStatus("No issues to report", ProbeStatus.Health.GREEN);
if (!isNpmModulesEngineStarted) {
status = ProbeStatusUtils.aggregateStatus(status, "The environment is not running JS modules (npm-modules-engine stopped or not present)", ProbeStatus.Health.GREEN);
} else {
if (!vmVendor.contains("GraalVM")) {
status = ProbeStatusUtils.aggregateStatus(status, String.format("GraalVM not detected on the environment (detected vendor: %s), after switching to GraalVM make sure to enable the Javascript extension", vmVendor), ProbeStatus.Health.RED);
} else if (System.getProperty("org.graalvm.version", "Unknown") == "Unknown") {
Fgerthoffert marked this conversation as resolved.
Show resolved Hide resolved
status = ProbeStatusUtils.aggregateStatus(status, String.format("GraalVM not detected on the environment (detected vendor: %s with JVM version: %s), after switching to GraalVM 22.3.3+ with JVM version 17+, make sure to enable the Javascript extension", vmVendor, jvmVersion), ProbeStatus.Health.RED);
} else {
if (jvmVersion.compareTo(new Version("22.3.3")) <= 0) {
Fgerthoffert marked this conversation as resolved.
Show resolved Hide resolved
status = ProbeStatusUtils.aggregateStatus(status, String.format("GraalVM version 22.3.3 or newer required (detected GraalVM version: %s)", graalVMVersion), ProbeStatus.Health.RED);
}
if (jvmVersion.compareTo(new Version("17")) <= 0) {
status = ProbeStatusUtils.aggregateStatus(status, String.format("GraalVM with JVM version 17 or newer required (detected: %s)", jvmVersion), ProbeStatus.Health.RED);
status = ProbeStatusUtils.aggregateStatus(status, String.format("GraalVM with JVM version 17 or newer required (detected JVM version: %s)", jvmVersion), ProbeStatus.Health.RED);
}
if (vmVendor.contains("GraalVM") && !isJavaScriptModuleInstalled()) {
Fgerthoffert marked this conversation as resolved.
Show resolved Hide resolved
status = ProbeStatusUtils.aggregateStatus(status, "GraalVM is detected but the JavaScript extension is not installed", ProbeStatus.Health.RED);
Expand Down
Loading