Skip to content

FISH-12969 Payara Server Startup Fails in Apache NetBeans IDE Due to the CRaCCheckpointTo Option #9237

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

Open
jGauravGupta wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −9
Open

FISH-12969 Payara Server Startup Fails in Apache NetBeans IDE Due to the CRaCCheckpointTo Option #9237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,7 @@ meth public java.util.Optional<java.lang.Short> getUpdate()
meth public java.util.Optional<java.lang.String> getVM()
meth public java.util.Optional<java.lang.String> getVendor()
meth public short getMajor()
meth public static boolean isCorrectJDK(java.util.Optional<org.netbeans.modules.payara.tooling.data.JDKVersion>,java.util.Optional<org.netbeans.modules.payara.tooling.data.JDKVersion>)
meth public static boolean isCorrectJDK(org.netbeans.modules.payara.tooling.data.JDKVersion,java.util.Optional<java.lang.String>,java.util.Optional<org.netbeans.modules.payara.tooling.data.JDKVersion>,java.util.Optional<org.netbeans.modules.payara.tooling.data.JDKVersion>)
meth public static boolean isCorrectJDK(org.netbeans.modules.payara.tooling.data.JDKVersion,java.util.Optional<java.lang.String>,java.util.Optional<org.netbeans.modules.payara.tooling.data.JDKVersion>,java.util.Optional<org.netbeans.modules.payara.tooling.data.JDKVersion>,java.lang.String,java.lang.String)
meth public static org.netbeans.modules.payara.tooling.data.JDKVersion getDefaultPlatformVersion()
meth public static org.netbeans.modules.payara.tooling.data.JDKVersion toValue(java.lang.String)
meth public static org.netbeans.modules.payara.tooling.data.JDKVersion toValue(java.lang.String,java.lang.String)
Expand Down
41 changes: 36 additions & 5 deletions enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/JDKVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,24 +283,55 @@ public static JDKVersion getDefaultPlatformVersion() {
return IDE_JDK_VERSION;
}

public static boolean isCorrectJDK(JDKVersion jdkVersion, Optional<String> vendorOrVM, Optional<JDKVersion> minVersion, Optional<JDKVersion> maxVersion) {
public static boolean isCorrectJDK(JDKVersion jdkVersion,
Optional<String> vendorOrVM,
Optional<JDKVersion> minVersion,
Optional<JDKVersion> maxVersion,
String jvmOption,
String javaHome) {

boolean correctJDK = true;

if (vendorOrVM.isPresent()) {
correctJDK = jdkVersion.getVendor().map(vendor -> vendor.contains(vendorOrVM.get())).orElse(false)
|| jdkVersion.getVM().map(vm -> vm.contains(vendorOrVM.get())).orElse(false);
correctJDK
= jdkVersion.getVendor()
.map(v -> v.contains(vendorOrVM.get()))
.orElse(false)
|| jdkVersion.getVM()
.map(vm -> vm.contains(vendorOrVM.get()))
.orElse(false);
}

if (correctJDK && minVersion.isPresent()) {
correctJDK = jdkVersion.ge(minVersion.get());
}

if (correctJDK && maxVersion.isPresent()) {
correctJDK = jdkVersion.le(maxVersion.get());
}

if (correctJDK
&& jvmOption != null
&& jvmOption.matches("^-XX:[+-]?CRaC.*")) {

correctJDK = isCRaCJDK(javaHome);
}

return correctJDK;
}

public static boolean isCorrectJDK(Optional<JDKVersion> minVersion, Optional<JDKVersion> maxVersion) {
return isCorrectJDK(IDE_JDK_VERSION, Optional.empty(), minVersion, maxVersion);
/**
* Checks whether the given JDK installation supports CRaC by verifying the
* presence of the lib/criu directory.
*
* @param javaHome Java home directory to check
* @return true if CRaC-enabled JDK
*/
public static boolean isCRaCJDK(String javaHome) {
return Optional.ofNullable(javaHome)
.map(home -> new java.io.File(home, "lib/criu"))
.map(java.io.File::exists)
.orElse(false);
}

static {
Expand Down
15 changes: 13 additions & 2 deletions enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerTasks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,22 @@ public static ResultProcess startServer(PayaraServer server,
}
}

JDKVersion javaVersion = args.getJavaVersion() == null ? JDKVersion.getDefaultPlatformVersion() : args.getJavaVersion() ;
JDKVersion javaVersion = args.getJavaVersion() == null ? JDKVersion.getDefaultPlatformVersion() : args.getJavaVersion();
String selectedJavaHome
= args.getJavaHome() != null
? args.getJavaHome()
: System.getProperty("java.home");
List<String> optList
= jvmConfigReader.getJvmOptions()
.stream()
.filter(fullOption -> JDKVersion.isCorrectJDK(javaVersion, fullOption.vendorOrVM, fullOption.minVersion, fullOption.maxVersion))
.filter(fullOption
-> JDKVersion.isCorrectJDK(
javaVersion,
fullOption.vendorOrVM,
fullOption.minVersion,
fullOption.maxVersion,
fullOption.option,
selectedJavaHome))
.map(fullOption -> fullOption.option)
.collect(toList());

Expand Down
Loading