mqbs::FileStore: Do not remove purge record even if app is deleted

Signed-off-by: Yuan Jing Vincent Yan <[email protected]>
bloomberg · Sep 27, 2024 · adb42e7 · adb42e7
1 parent c186674
commit adb42e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/src/groups/mqb/mqbc/mqbc_storageutil.cpp b/src/groups/mqb/mqbc/mqbc_storageutil.cpp
@@ -2034,7 +2034,9 @@ void StorageUtil::recoveredQueuesCb(
                 // (something like 'inRecovery=true'), based on which storage
                 // implementation may or may not invoke certain business logic.
 
-                rs->purge(appKey);
+                if (rs->hasVirtualStorage(appKey)) {
+                    rs->purge(appKey);
+                }
             }
 
             // TBD: check if adding 'else if' clauses for 'ADDITION',

diff --git a/src/groups/mqb/mqbs/mqbs_filestore.cpp b/src/groups/mqb/mqbs/mqbs_filestore.cpp
@@ -1733,23 +1733,7 @@ int FileStore::recoverMessages(QueueKeyInfoMap*     queueKeyInfoMap,
                     }
                 }
 
-                if (!appKey.isNull()) {
-                    // Specific appKey is purged.
-                    StorageKeysOffsetsConstIter appKeyIt =
-                        deletedAppKeysOffsets.find(appKey);
-
-                    if (appKeyIt != deletedAppKeysOffsets.end()) {
-                        BSLS_ASSERT_SAFE(jit->recordOffset() !=
-                                         appKeyIt->second);
-                        if (jit->recordOffset() < appKeyIt->second) {
-                            // This record appears before the QueueOp.DELETION
-                            // record for this appKey so should be ignored.
-
-                            continue;  // CONTINUE
-                        }
-                    }
-                }
-                else {
+                if (appKey.isNull()) {
                     // Entire queue is purged.
                     purgedQueueKeys.insert(queueKey);
                 }