Fix: correctly set d_hasReceipts for FileBackedStorage on configure

Signed-off-by: Evgeny Malygin <[email protected]>

src/groups/mqb/mqbblp/mqbblp_localqueue.cpp

@@ -139,6 +139,7 @@ int LocalQueue::configure(bsl::ostream& errorDescription, bool isReconfigure)
         d_state_p->setStorage(storageMp);
     }
     else {
+        d_state_p->storage()->setConsistency(domainCfg.consistency());
         rc = d_state_p->storage()->configure(errorDescription,
                                              domainCfg.storage().config(),
                                              domainCfg.storage().queueLimits(),

src/groups/mqb/mqbblp/mqbblp_queueenginetester.cpp

@@ -539,6 +539,7 @@ void QueueEngineTester::init(const mqbconfm::Domain& domainConfig,
     limits.messages() = bsl::numeric_limits<bsls::Types::Int64>::max();
     limits.bytes()    = bsl::numeric_limits<bsls::Types::Int64>::max();
 
+    storage_p->setConsistency(domainConfig.consistency());
     rc = storage_p->configure(errorDescription,
                               config,
                               limits,

src/groups/mqb/mqbblp/mqbblp_remotequeue.cpp

@@ -124,6 +124,7 @@ int RemoteQueue::configureAsProxy(bsl::ostream& errorDescription,
     limits.messages() = bsl::numeric_limits<bsls::Types::Int64>::max();
     limits.bytes()    = bsl::numeric_limits<bsls::Types::Int64>::max();
 
+    storageMp->setConsistency(domainCfg.consistency());
     int rc = storageMp->configure(errorDescription,
                                   config,
                                   limits,
@@ -243,6 +244,7 @@ int RemoteQueue::configureAsClusterMember(bsl::ostream& errorDescription,
             d_allocator_p);
     }
     else {
+        d_state_p->storage()->setConsistency(domainCfg.consistency());
         rc = d_state_p->storage()->configure(
             errorDescription,
             domainCfg.storage().config(),

src/groups/mqb/mqbc/mqbc_storageutil.cpp

@@ -3210,6 +3210,8 @@ int StorageUtil::makeStorage(bsl::ostream& errorDescription,
     // Configure the storage.  Note that if a queue calls 'makeStorage' twice,
     // its storage will be configured twice as things are currently.
 
+    // Do not change consistency level of `storageSp`, use the one provided on
+    // construction instead.
     const int rc = storageSp->configure(errorDescription,
                                         storageDef.config(),
                                         storageDef.queueLimits(),

src/groups/mqb/mqbi/mqbi_storage.h

@@ -408,6 +408,10 @@ class Storage {
                           const bsls::Types::Int64 messageTtl,
                           const int                maxDeliveryAttempts) = 0;
 
+    /// Set the consistency level associated to this storage to the specified
+    /// `value`.
+    virtual bool setConsistency(const mqbconfm::Consistency& value) = 0;
+
     virtual void setQueue(mqbi::Queue* queue) = 0;
 
     /// Close this storage.

src/groups/mqb/mqbs/mqbs_filebackedstorage.cpp

@@ -248,6 +248,14 @@ int FileBackedStorage::configure(
     return 0;
 }
 
+bool FileBackedStorage::setConsistency(const mqbconfm::Consistency& value)
+{
+    // PRECONDITIONS
+    BSLS_ASSERT_SAFE(value.isEventualValue() || value.isStrongValue());
+
+    d_hasReceipts = value.isEventualValue();
+}
+
 void FileBackedStorage::setQueue(mqbi::Queue* queue)
 {
     d_virtualStorageCatalog.setQueue(queue);

src/groups/mqb/mqbs/mqbs_filebackedstorage.h

@@ -203,7 +203,7 @@ class FileBackedStorage BSLS_KEYWORD_FINAL : public ReplicatedStorage {
     bmqp::SchemaLearner::Context d_schemaLearnerContext;
     // Context for replicated data.
 
-    const bool d_hasReceipts;
+    bool d_hasReceipts;
 
     bmqt::MessageGUID d_currentlyAutoConfirming;
     // Message being evaluated and possibly auto confirmed.
@@ -365,6 +365,11 @@ class FileBackedStorage BSLS_KEYWORD_FINAL : public ReplicatedStorage {
                           const bsls::Types::Int64 messageTtl,
                           int maxDeliveryAttempts) BSLS_KEYWORD_OVERRIDE;
 
+    /// Set the consistency level associated to this storage to the specified
+    /// `value`.
+    bool
+    setConsistency(const mqbconfm::Consistency& value) BSLS_KEYWORD_OVERRIDE;
+
     /// Return the resource capacity meter associated to this storage.
     virtual mqbu::CapacityMeter* capacityMeter() BSLS_KEYWORD_OVERRIDE;
 

src/groups/mqb/mqbs/mqbs_inmemorystorage.cpp

@@ -110,6 +110,17 @@ int InMemoryStorage::configure(
     return 0;
 }
 
+bool InMemoryStorage::setConsistency(const mqbconfm::Consistency& value)
+{
+    BALL_LOG_WARN_BLOCK
+    {
+        if (value.isStrongValue()) {
+            BALL_LOG_OUTPUT_STREAM << "Trying to configure strong consistency "
+                                   << "for in-memory storage";
+        }
+    }
+}
+
 void InMemoryStorage::setQueue(mqbi::Queue* queue)
 {
     d_virtualStorageCatalog.setQueue(queue);

src/groups/mqb/mqbs/mqbs_inmemorystorage.h

@@ -270,6 +270,11 @@ class InMemoryStorage BSLS_KEYWORD_FINAL : public ReplicatedStorage {
                           const bsls::Types::Int64 messageTtl,
                           const int maxDeliveryAttempts) BSLS_KEYWORD_OVERRIDE;
 
+    /// Set the consistency level associated to this storage to the specified
+    /// `value`.
+    bool
+    setConsistency(const mqbconfm::Consistency& value) BSLS_KEYWORD_OVERRIDE;
+
     virtual void setQueue(mqbi::Queue* queue) BSLS_KEYWORD_OVERRIDE;
 
     /// Close this storage.

src/integration-tests/test_strong_consistency.py

@@ -256,7 +256,7 @@ def test_change_consistency(self, multi_node: Cluster):
                     wait_ack=False,
                 )
                 # Cannot wait for too long because resumed nodes may disconnect
-                # because of missed hearbeats and fail to send the receipt.
+                # because of missed heartbeats and fail to send the receipt.
                 assert not self.consumer.wait_push_event(timeout=3)
 
             # Verify that message is now delivered.