Skip to content

Commit

Permalink
Another try to fix starts on Windows
Browse files Browse the repository at this point in the history 
- Tested via SSH and locally
- Tested on domains and instances
- Very probably can be simplified later, especially problematic is hard coded
  timeout in the generated ps1 script.

Signed-off-by: David Matějček <[email protected]>
  • Loading branch information
@dmatej
dmatej committed Jan 19, 2025
1 parent c9eba7d commit 65201e4
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 13 deletions.
4 changes: 2 additions & 2 deletions ...er/itest-tools/src/main/java/org/glassfish/main/itest/tools/GlassFishTestEnvironment.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2024 Eclipse Foundation and/or its affiliates.
* Copyright (c) 2022, 2025 Eclipse Foundation and/or its affiliates.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -363,7 +363,7 @@ private static File findPasswordFile(final String filename) {

private static void changePassword() {
final Asadmin asadmin = new Asadmin(ASADMIN, ADMIN_USER, PASSWORD_FILE_FOR_UPDATE);
final AsadminResult result = asadmin.exec(5_000, "change-admin-password");
final AsadminResult result = asadmin.exec(20_000, "change-admin-password");
if (result.isError()) {
// probably changed by previous execution without maven clean
System.out.println("Admin password NOT changed.");
Expand Down
52 changes: 41 additions & 11 deletions nucleus/admin/launcher/src/main/java/com/sun/enterprise/admin/launcher/GFLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,8 @@ void launchInstance() throws GFLauncherException {
cmds.add("/");
cmds.addAll(getCommandLine());
} else if (isWindows()) {
cmds = prepareWindowsEnvironment(getCommandLine(), getInfo().getConfigDir().toPath(),
getInfo().isVerboseOrWatchdog());
boolean preloadStdin = !getInfo().isVerbose() && isSSHSession();
cmds = prepareWindowsEnvironment(getCommandLine(), getInfo().getConfigDir().toPath(), preloadStdin);
} else if (getInfo().isVerboseOrWatchdog()) {
cmds = getCommandLine();
} else {
Expand All @@ -458,6 +458,9 @@ void launchInstance() throws GFLauncherException {
System.err.println("Executing: " + cmds.stream().collect(Collectors.joining(" ")));
System.err.println("Please look at the server log for more details...");
ProcessBuilder processBuilder = new ProcessBuilder(cmds);
if (getInfo().isVerbose()) {
processBuilder.inheritIO();
}

// Change the directory if there is one specified, o/w stick with the default.
try {
Expand Down Expand Up @@ -621,7 +624,7 @@ private void parseJavaConfigDebugOptions() {
}
}

private void setLogFilename(MiniXmlParser domainXML) throws GFLauncherException {
private void setLogFilename(MiniXmlParser domainXML) {
logFilename = domainXML.getLogFilename();

if (logFilename == null) {
Expand Down Expand Up @@ -790,7 +793,7 @@ void setCommandLine() throws GFLauncherException {
}
}

void setJvmOptions() throws GFLauncherException {
void setJvmOptions() {
domainXMLJvmOptionsAsList.clear();

if (domainXMLjvmOptions != null) {
Expand Down Expand Up @@ -1080,7 +1083,7 @@ private static boolean isSSHSession() {


private static List<String> prepareWindowsEnvironment(final List<String> command, final Path configDir,
final boolean bindToCaller) throws GFLauncherException {
final boolean stdinPreloaded) throws GFLauncherException {
Path psFile;
Path batFile;
try {
Expand Down Expand Up @@ -1108,7 +1111,7 @@ private static List<String> prepareWindowsEnvironment(final List<String> command
}
batContent.append('\n');
}
if (!bindToCaller) {
if (stdinPreloaded) {
batContent.append("< %1\n");
}
Files.writeString(batFile, batContent, UTF_8, TRUNCATE_EXISTING, CREATE);
Expand All @@ -1118,15 +1121,29 @@ private static List<String> prepareWindowsEnvironment(final List<String> command
psContent.append(" [Parameter(Mandatory=$true)]\n");
psContent.append(" [string]$BatchFilePath\n");
psContent.append(")\n");
if (bindToCaller || !isSSHSession()) {
psContent.append("Start-Process -FilePath \"$BatchFilePath\" -NoNewWindow\n");
} else {

psContent.append("$pidFile = \"").append(new File(configDir.toFile(), "pid").getAbsolutePath()).append("\"\n");
psContent.append("if (Test-Path $pidFile) {\n");
psContent.append(" Remove-Item $pidFile -Force\n");
psContent.append("}\n");
if (stdinPreloaded) {
psContent.append("$stdin = [System.IO.StreamReader]::new([Console]::OpenStandardInput()).ReadToEnd()\n");
psContent.append("$tempFile = [System.IO.Path]::GetTempFileName()\n");
psContent.append("[System.IO.File]::WriteAllText($tempFile, $stdin)\n");

}
if (!isSSHSession()) {
psContent.append("Start-Process -FilePath \"$BatchFilePath\" -NoNewWindow -Wait -PassThru");
if (stdinPreloaded) {
psContent.append(" < $tempFile");
}
psContent.append('\n');
} else {
psContent.append("$action = New-ScheduledTaskAction -Execute \"cmd.exe\" -Argument \"/c $BatchFilePath");
if (stdinPreloaded) {
psContent.append(" < $tempFile");
}
psContent.append("\"\n");
psContent.append("$taskName = \"GlassFishInstance_\" + [System.Guid]::NewGuid().ToString()\n");
psContent.append("$action = New-ScheduledTaskAction -Execute \"cmd.exe\" -Argument \"/c $BatchFilePath < $tempFile\"\n");
psContent.append("$trigger = New-ScheduledTaskTrigger -Once -At (Get-Date).AddSeconds(1)\n");
psContent.append("$principal = New-ScheduledTaskPrincipal -UserId $env:USERNAME -LogonType S4U\n");
psContent.append("$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -ExecutionTimeLimit (New-TimeSpan -Hours 0)\n");
Expand All @@ -1136,12 +1153,25 @@ private static List<String> prepareWindowsEnvironment(final List<String> command
psContent.append("Start-Sleep -Seconds 5\n");
psContent.append("Unregister-ScheduledTask -TaskName $taskName -Confirm:$false\n");
}
psContent.append("$start = Get-Date\n");
psContent.append("$timeout = 60\n");
psContent.append("while (-not (Test-Path $pidFile)) {\n");
psContent.append(" if ((New-TimeSpan -Start $start -End (Get-Date)).TotalSeconds -gt $timeout) {\n");
psContent.append(" Write-Error \"Timeout waiting for GlassFish to start (pid file not created within $timeout seconds)\"\n");
psContent.append(" exit 1\n");
psContent.append(" }\n");
psContent.append(" Start-Sleep -Seconds 1\n");
psContent.append("}\n");

Files.writeString(psFile, psContent, UTF_8, TRUNCATE_EXISTING, CREATE);
} catch (IOException e) {
throw new GFLauncherException(e);
}
final List<String> cmds = new ArrayList<>();
cmds.add("powershell.exe");
if (stdinPreloaded) {
cmds.add("-noninteractive");
}
cmds.add("-File");
cmds.add("\"" + psFile.toFile().getAbsolutePath() + "\"");
cmds.add("-BatchFilePath");
Expand Down

0 comments on commit 65201e4

Please sign in to comment.