Skip to content

Expand-DbaDbLogFile - Stop eating the caller loop when the log file processing fails #10703

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
potatoqualitee merged 2 commits into from
Sep 14, 2026
+11 −6
Merged

Expand-DbaDbLogFile - Stop eating the caller loop when the log file processing fails #10703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ed3150
Expand-DbaDbLogFile - Stop eating the caller loop when the log file p…
andreasjordan Sep 12, 2026
6296eaa
Expand-DbaDbLogFile - Let the TargetVlfCount unit test really run
andreasjordan Sep 12, 2026
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
10 changes: 6 additions & 4 deletions public/Expand-DbaDbLogFile.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,13 @@ function Expand-DbaDbLogFile {
# We don't have windows credentials here, so Resolve-DbaNetworkName has to respect that and work like Resolve-NetBiosName did before.
$resolvedComputerName = Resolve-DbaComputerName -ComputerName $SqlInstance

$databases = $server.Databases | Where-Object IsAccessible
$databases = @($server.Databases | Where-Object IsAccessible)
Write-Message -Level Verbose -Message "Number of databases found: $($databases.Count)."
if ($Database) {
$databases = $databases | Where-Object Name -In $Database
$databases = @($databases | Where-Object Name -In $Database)
}
if ($ExcludeDatabase) {
$databases = $databases | Where-Object Name -NotIn $ExcludeDatabase
$databases = @($databases | Where-Object Name -NotIn $ExcludeDatabase)
}

#go through all databases
Expand Down Expand Up @@ -686,7 +686,9 @@ function Expand-DbaDbLogFile {
} | Select-DefaultView -ExcludeProperty LogFileCount
} #foreach database
} catch {
Stop-Function -Message "Logfile $logfile on database $dbName not processed. Error: $($_.Exception.Message). Line Number: $($_InvocationInfo.ScriptLineNumber)" -Continue
# No -Continue here: this block has no enclosing loop, so the continue would escape the command
# and eat an iteration of whatever loop the caller runs in (#10638).
Stop-Function -Message "Logfile $logfile on database $dbName not processed. Error: $($_.Exception.Message). Line Number: $($_.InvocationInfo.ScriptLineNumber)"
}
}

Expand Down
7 changes: 5 additions & 2 deletions tests/Expand-DbaDbLogFile.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ Describe $CommandName -Tag UnitTests {
function Select-DefaultView {
param(
[Parameter(ValueFromPipeline)]
$InputObject
$InputObject,
$ExcludeProperty
)

process {
Expand All @@ -92,7 +93,9 @@ Describe $CommandName -Tag UnitTests {
Mock Connect-DbaInstance {
$script:mockServer
}
Mock Measure-DbaDbVirtualLogFile {
function Measure-DbaDbVirtualLogFile {
param($SqlInstance, $Database)

$script:measureCallCount += 1

if ($script:measureCallCount -eq 1) {
Expand Down