Skip to content

Fix empty catch blocks in transaction rollback handlers #6

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 5 commits into from
Closed

Fix empty catch blocks in transaction rollback handlers #6

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b6826e
Initial plan
Copilot Jan 26, 2026
699fcd8
Fix empty catch blocks in transaction rollback handlers
Copilot Jan 26, 2026
4e3448d
Add missing transaction rollback in PruneOplogAsync exception handler
Copilot Jan 26, 2026
0dc50cb
Use LogError for rollback failures in database corruption cases
Copilot Jan 26, 2026
7aa790c
Format try-catch blocks with multi-line style for better readability
Copilot Jan 26, 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
35 changes: 32 additions & 3 deletions src/EntglDb.Persistence.Sqlite/SqlitePeerStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,13 +870,27 @@ INSERT INTO Oplog (Collection, Key, Operation, JsonData, HlcWall, HlcLogic, HlcN
catch (SqliteException ex) when (ex.SqliteErrorCode == 11 || ex.SqliteErrorCode == 26) // SQLITE_CORRUPT or SQLITE_NOTADB
{
_logger.LogCritical(ex, "Database corruption detected during ApplyBatchAsync!");
try { transaction.Rollback(); } catch { }
try
{
transaction.Rollback();
}
catch (Exception rollbackEx)
{
_logger.LogError(rollbackEx, "Failed to rollback transaction after database corruption");
}
throw new CorruptDatabaseException("SQLite database is corrupt", ex);
}
catch (Exception ex)
{
_logger.LogError(ex, "Failed to apply batch");
try { transaction.Rollback(); } catch { }
try
{
transaction.Rollback();
}
catch (Exception rollbackEx)
{
_logger.LogWarning(rollbackEx, "Failed to rollback transaction");
}
throw;
}

Expand Down Expand Up @@ -1023,12 +1037,27 @@ DELETE FROM Oplog
catch (SqliteException ex) when (ex.SqliteErrorCode == 11 || ex.SqliteErrorCode == 26) // SQLITE_CORRUPT or SQLITE_NOTADB
{
_logger.LogCritical(ex, "Database corruption detected during oplog pruning (PruneOplogAsync).");
try { transaction.Rollback(); } catch { }
try
{
transaction.Rollback();
}
catch (Exception rollbackEx)
{
_logger.LogError(rollbackEx, "Failed to rollback transaction after database corruption");
}
throw new CorruptDatabaseException("SQLite database is corrupt", ex);
}
catch (Exception ex)
{
_logger.LogError(ex, "Failed to prune oplog");
try
{
transaction.Rollback();
}
catch (Exception rollbackEx)
{
_logger.LogWarning(rollbackEx, "Failed to rollback transaction");
}
throw;
}
}
Expand Down
Loading