Skip to content

Fix: Console freezes on Windows 2012 R2 during IMC installation #515

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

Merged
LordHepipud merged 1 commit into from
Apr 27, 2022
Merged

Fix: Console freezes on Windows 2012 R2 during IMC installation #515

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
2 changes: 1 addition & 1 deletion lib/core/framework/Install-IcingaFrameworkComponent.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function Install-IcingaFrameworkComponent()

if ([string]::IsNullOrEmpty((Get-IcingaJEAContext)) -eq $FALSE) {
Write-IcingaConsoleNotice 'Updating Icinga JEA profile';
Invoke-IcingaCommand -ScriptBlock { Install-IcingaJEAProfile; } | Out-Null;
& powershell.exe -Command { Use-Icinga; Install-IcingaJEAProfile; } | Out-Null;
}

# Unload the module if it was loaded before
Expand Down
2 changes: 1 addition & 1 deletion lib/core/framework/Install-IcingaFrameworkUpdate.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function Install-IcingaFrameworkUpdate()
if ([string]::IsNullOrEmpty((Get-IcingaJEAContext)) -eq $FALSE) {
Remove-IcingaFrameworkDependencyFile;
Write-IcingaConsoleNotice 'Updating Icinga JEA profile';
Invoke-IcingaCommand -ScriptBlock { Install-IcingaJEAProfile; } | Out-Null;
& powershell.exe -Command { Use-Icinga; Install-IcingaJEAProfile; } | Out-Null;
}

Write-IcingaConsoleNotice 'Framework update has been completed. Please start a new PowerShell instance now to complete the update';
Expand Down
9 changes: 5 additions & 4 deletions lib/core/framework/Restart-IcingaService.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ function Restart-IcingaService()
if (Get-Service "$Service" -ErrorAction SilentlyContinue) {
Write-IcingaConsoleNotice ([string]::Format('Restarting service "{0}"', $Service));

Invoke-IcingaCommand -ArgumentList $Service -ScriptBlock {
& powershell.exe -Command {
$Service = $args[0];
try {
Restart-Service "$($IcingaShellArgs[0])" -ErrorAction Stop;
Restart-Service "$Service" -ErrorAction Stop;
Start-Sleep -Seconds 2;
Optimize-IcingaForWindowsMemory;
} catch {
Write-IcingaConsoleError -Message 'Failed to restart service "{0}". Error: {1}' -Objects $IcingaShellArgs[0], $_.Exception.Message;
Write-IcingaConsoleError -Message 'Failed to restart service "{0}". Error: {1}' -Objects $Service, $_.Exception.Message;
}
} | Out-Null;
} -Args $Service;
} else {
Write-IcingaConsoleWarning -Message 'The service "{0}" is not installed' -Objects $Service;
}
Expand Down
9 changes: 5 additions & 4 deletions lib/core/framework/Start-IcingaService.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@ function Start-IcingaService()
if (Get-Service $Service -ErrorAction SilentlyContinue) {
Write-IcingaConsoleNotice -Message 'Starting service "{0}"' -Objects $Service;

Invoke-IcingaCommand -ArgumentList $Service -ScriptBlock {
& powershell.exe -Command {
$Service = $args[0];
try {
Start-Service "$($IcingaShellArgs[0])" -ErrorAction Stop;
Start-Service "$Service" -ErrorAction Stop;
Start-Sleep -Seconds 2;
Optimize-IcingaForWindowsMemory;
} catch {
Write-IcingaConsoleError -Message 'Failed to start service "{0}". Error: {1}' -Objects $IcingaShellArgs[0], $_.Exception.Message;
Write-IcingaConsoleError -Message 'Failed to start service "{0}". Error: {1}' -Objects $Service, $_.Exception.Message;
}
} | Out-Null;
} -Args $Service;
} else {
Write-IcingaConsoleWarning -Message 'The service "{0}" is not installed' -Objects $Service;
}
Expand Down
11 changes: 6 additions & 5 deletions lib/core/framework/Stop-IcingaService.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,19 @@ function Stop-IcingaService()
$Service
);

if (Get-Service $Service -ErrorAction SilentlyContinue) {
if (Get-Service "$Service" -ErrorAction SilentlyContinue) {
Write-IcingaConsoleNotice -Message 'Stopping service "{0}"' -Objects $Service;

Invoke-IcingaCommand -ArgumentList $Service -ScriptBlock {
& powershell.exe -Command {
$Service = $args[0];
try {
Stop-Service "$($IcingaShellArgs[0])" -ErrorAction Stop;
Stop-Service "$Service" -ErrorAction Stop;
Start-Sleep -Seconds 2;
Optimize-IcingaForWindowsMemory;
} catch {
Write-IcingaConsoleError -Message 'Failed to stop service "{0}". Error: {1}' -Objects $IcingaShellArgs[0], $_.Exception.Message;
Write-IcingaConsoleError -Message 'Failed to stop service "{0}". Error: {1}' -Objects $Service, $_.Exception.Message;
}
} | Out-Null;
} -Args $Service;
} else {
Write-IcingaConsoleWarning -Message 'The service "{0}" is not installed' -Objects $Service;
}
Expand Down
9 changes: 4 additions & 5 deletions lib/core/icingaagent/installer/Install-IcingaAgent.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,16 @@ function Install-IcingaAgent()
}
}

$InstallProcess = Invoke-IcingaCommand -ArgumentList $IcingaInstaller, $InstallTarget -ScriptBlock {
$IcingaInstaller = $IcingaShellArgs[0];
$InstallTarget = $IcingaShellArgs[1];

$InstallProcess = & powershell.exe -Command {
$IcingaInstaller = $args[0];
$InstallTarget = $args[1];
$InstallProcess = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('/quiet /i "{0}" {1}', $IcingaInstaller.InstallerPath, $InstallTarget)) -FlushNewLines;

Start-Sleep -Seconds 2;
Optimize-IcingaForWindowsMemory;

return $InstallProcess;
}
} -Args $IcingaInstaller, $InstallTarget;

if ($InstallProcess.ExitCode -ne 0) {
Write-IcingaConsoleError -Message 'Failed to install Icinga 2 Agent: {0}{1}' -Objects $InstallProcess.Message, $InstallProcess.Error;
Expand Down
7 changes: 3 additions & 4 deletions lib/core/icingaagent/installer/Uninstall-IcingaAgent.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ function Uninstall-IcingaAgent()

Stop-IcingaService -Service 'icinga2';

$Uninstaller = Invoke-IcingaCommand -ArgumentList $IcingaData -ScriptBlock {
$IcingaData = $IcingaShellArgs[0];

$Uninstaller = & powershell.exe -Command {
$IcingaData = $args[0];
$Uninstaller = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('{0} /q', $IcingaData.Uninstaller)) -FlushNewLine;

Start-Sleep -Seconds 2;
Optimize-IcingaForWindowsMemory;

return $Uninstaller;
}
} -Args $IcingaData;

if ($Uninstaller.ExitCode -ne 0) {
Write-IcingaConsoleError ([string]::Format('Failed to remove Icinga Agent: {0}{1}', $Uninstaller.Message, $Uninstaller.Error));
Expand Down
18 changes: 9 additions & 9 deletions lib/core/repository/Install-IcingaComponent.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,10 @@ function Install-IcingaComponent()
}
}

$MSIData = Invoke-IcingaCommand -ArgumentList $DownloadDestination -ScriptBlock {
return (Read-IcingaMSIMetadata -File $IcingaShellArgs[0]);
}
$MSIData = & powershell.exe -Command {
$DownloadDestination = $args[0];
return (Read-IcingaMSIMetadata -File $DownloadDestination);
} -Args $DownloadDestination;

if ($InstalledVersion.Full -eq $MSIData.ProductVersion -And $Force -eq $FALSE) {
Write-IcingaConsoleWarning 'The package "agent" with version "{0}" is already installed. Use "-Force" to re-install the component' -Objects $InstalledVersion.Full;
Expand All @@ -367,17 +368,16 @@ function Install-IcingaComponent()
}
}

$InstallProcess = Invoke-IcingaCommand -ArgumentList $DownloadDestination, $InstallTarget -ScriptBlock {
$IcingaInstaller = $IcingaShellArgs[0];
$InstallTarget = $IcingaShellArgs[1];

$InstallProcess = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('/quiet /i "{0}" {1}', $IcingaInstaller, $InstallTarget)) -FlushNewLines;
$InstallProcess = & powershell.exe -Command {
$DownloadDestination = $args[0];
$InstallTarget = $args[1];
$InstallProcess = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('/quiet /i "{0}" {1}', $DownloadDestination, $InstallTarget)) -FlushNewLines;

Start-Sleep -Seconds 2;
Optimize-IcingaForWindowsMemory;

return $InstallProcess;
}
} -Args $DownloadDestination, $InstallTarget;

if ($InstallProcess.ExitCode -ne 0) {
Write-IcingaConsoleError -Message 'Failed to install component "agent": {0}{1}' -Objects $InstallProcess.Message, $InstallProcess.Error;
Expand Down