Skip to content

[FCM] Narrower database open recovery logic #15678

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
paulb777 merged 4 commits into from
Jan 7, 2026
Merged

[FCM] Narrower database open recovery logic #15678

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4fe13b
[FCM] Narrower database open recovery logic
paulb777 Jan 6, 2026
1b7b030
Apply suggestions from code review
paulb777 Jan 7, 2026
9ed48d9
Apply suggestions from code review
paulb777 Jan 7, 2026
19edf47
style
paulb777 Jan 7, 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
55 changes: 35 additions & 20 deletions FirebaseMessaging/Sources/FIRMessagingRmqManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,31 +530,46 @@ - (void)openDatabase {
// If opening the database failed, it might be corrupt. Try to recover by deleting and
// recreating it.
if (result != SQLITE_OK) {
FIRMessagingLoggerWarn(kFIRMessagingMessageCodeRmq2PersistentStoreErrorOpeningDatabase,
@"Could not open RMQ database at path: %@. "
"Will delete and try to recreate it.",
path);
NSError *removeError;
if (![[NSFileManager defaultManager] removeItemAtPath:path error:&removeError]) {
FIRMessagingLoggerWarn(kFIRMessagingMessageCodeRmq2PersistentStoreErrorOpeningDatabase,
@"Failed to delete corrupt database at %@: %@", path, removeError);
}
// After deleting, try to open it again.
result = sqlite3_open_v2([path UTF8String], &self->_database, flags, NULL);
// If it still fails after the recovery attempt, then assert and crash.
if (result != SQLITE_OK) {
if (result == SQLITE_CANTOPEN) {
FIRMessagingLoggerWarn(
kFIRMessagingMessageCodeRmq2PersistentStoreErrorOpeningDatabase,
@"Could not open RMQ database at path: %@. Will delete and try to recreate it.",
path);
NSError *removeError;
if (![[NSFileManager defaultManager] removeItemAtPath:path error:&removeError]) {
FIRMessagingLoggerWarn(kFIRMessagingMessageCodeRmq2PersistentStoreErrorOpeningDatabase,
@"Failed to delete corrupt database at %@: %@", path,
removeError);
}
// After deleting, try to open it again.
result = sqlite3_open_v2([path UTF8String], &self->_database, flags, NULL);
// If it still fails after the recovery attempt, then assert and crash.
if (result != SQLITE_OK) {
NSString *errorString = FIRMessagingStringFromSQLiteResult(result);
NSString *errorMessage = [NSString
stringWithFormat:@"Could not open or create RMQ database at path %@, error: %@",
path, errorString];
FIRMessagingLoggerError(kFIRMessagingMessageCodeRmq2PersistentStoreErrorOpeningDatabase,
@"%@", errorMessage);
NSAssert(NO, errorMessage);
didOpenDatabase = NO; // Still failed, so indicate database did not open.
} else {
// Successfully recreated after corruption, so treat as a new database for table
// creation.
didOpenDatabase = YES; // Indicate successful opening after recreation.
[self createTable];
}
} else {
NSString *errorString = FIRMessagingStringFromSQLiteResult(result);
NSString *errorMessage = [NSString
stringWithFormat:@"Could not open or create RMQ database at path %@, error: %@", path,
errorString];
NSString *errorMessage =
[NSString stringWithFormat:
@"Could not open RMQ database at path %@, error: %@. Won't delete the "
"database as it is not a corrupt database error.",
path, errorString];
FIRMessagingLoggerError(kFIRMessagingMessageCodeRmq2PersistentStoreErrorOpeningDatabase,
@"%@", errorMessage);
NSAssert(NO, errorMessage);
didOpenDatabase = NO; // Still failed, so indicate database did not open.
} else {
// Successfully recreated after corruption, so treat as a new database for table creation.
didOpenDatabase = YES; // Indicate successful opening after recreation.
[self createTable];
}
} else {
[self updateDBWithStringRmqID];
Expand Down
Loading