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

Pull request into the dev branch #187

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Pull request into the dev branch #187

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
644562f
Update PrivateCloud.DiagnosticInfo.psm1
tomwoh May 23, 2024
36bbf7d
Update PrivateCloud.DiagnosticInfo.psm1
tomwoh May 23, 2024
b774bba
Update PrivateCloud.DiagnosticInfo.psm1
tomwoh Jun 4, 2024
85904ad
Merge branch 'dev' into patch-1
tomwoh Jun 24, 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
36 changes: 14 additions & 22 deletions PrivateCloud.DiagnosticInfo/PrivateCloud.DiagnosticInfo.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,22 +2013,6 @@ function Get-SddcDiagnosticInfo
}
catch { Show-Warning("Unable to get Cluster Quorum. `nError="+$_.Exception.Message) }
}

$JobStatic += start-job -Name CauDebugTrace {
try {

# SCDT returns a fileinfo object for the saved ZIP on the pipeline; discard (allow errors/warnings to flow as normal)
$parameters = (Get-Command Save-CauDebugTrace).Parameters.Keys
if ($parameters -contains "FeatureUpdateLogs") {
$null = Save-CauDebugTrace -Cluster $using:AccessNode -FeatureUpdateLogs All -FilePath $using:Path
}
else {
$null = Save-CauDebugTrace -Cluster $using:AccessNode -FilePath $using:Path
}
}
catch { Show-Warning("Unable to get CAU debug trace. `nError="+$_.Exception.Message) }
}

} else {
Show-Update "... Skip gather of cluster configuration since cluster is not available"
}
Expand Down Expand Up @@ -2287,7 +2271,7 @@ function Get-SddcDiagnosticInfo
}

# Events, cmd, reports, et.al.
Show-Update "Start gather of system info, cluster/netft/health logs, reports and dump files ..."
Show-Update "Start gather of system info, cluster/netft/health/CAU logs, reports and dump files ..."

$JobStatic += Start-Job -Name ClusterLogs {
$null = Get-ClusterLog -Node $using:ClusterNodes.Name -Destination $using:Path -UseLocalTime
Expand All @@ -2296,12 +2280,20 @@ function Get-SddcDiagnosticInfo
{
$null = Get-ClusterLog -Node $using:ClusterNodes.Name -Destination $using:Path -UseLocalTime -Netft
}
}

if ($S2DEnabled) {
$JobStatic += Start-Job -Name ClusterHealthLogs {
if ($using:S2DEnabled) {
$null = Get-ClusterLog -Node $using:ClusterNodes.Name -Destination $using:Path -Health -UseLocalTime
}

try {
# SCDT returns a fileinfo object for the saved ZIP on the pipeline; discard (allow errors/warnings to flow as normal)
if ((Get-Command Save-CauDebugTrace).Parameters.ContainsKey("FeatureUpdateLogs")) {
$null = Save-CauDebugTrace -Cluster $using:AccessNode -FeatureUpdateLogs All -FilePath $using:Path
}
else {
$null = Save-CauDebugTrace -Cluster $using:AccessNode -FilePath $using:Path
}
}
catch { Show-Warning("Unable to get CAU debug trace. `nError="+$_.Exception.Message) }
}

$JobStatic += $ClusterNodes.Name |% {
Expand Down Expand Up @@ -6378,4 +6370,4 @@ Export-ModuleMember -Alias * -Function 'Get-SddcDiagnosticInfo',
'Show-StorageCounters',
'Get-SpacesTimeline',
'Set-SddcDiagnosticArchiveJobParameters',
'Get-SddcDiagnosticArchiveJobParameters'
'Get-SddcDiagnosticArchiveJobParameters'