Detect and recover from invalid database environment.

Sometimes wrong databases are returned for the name, probably related
to threading/incorrect usage of lmdb.
For the time being we recover from that by detecting it and retrying.

1 files changed, 13 insertions, 3 deletions

diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index ea17176..fd966a9 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -408,9 +408,19 @@ QPair<qint64, qint64> QueryWorker<DomainType>::load(const Sink::Query &query, co
     QTime time;
     time.start();
 
-    Sink::Storage storage(Sink::storageLocation(), mResourceInstanceIdentifier);
-    storage.setDefaultErrorHandler([](const Sink::Storage::Error &error) { Warning() << "Error during query: " << error.store << error.message; });
-    auto transaction = storage.createTransaction(Sink::Storage::ReadOnly);
+    Sink::Storage::Transaction transaction;
+    {
+        Sink::Storage storage(Sink::storageLocation(), mResourceInstanceIdentifier);
+        storage.setDefaultErrorHandler([](const Sink::Storage::Error &error) { Warning() << "Error during query: " << error.store << error.message; });
+        transaction = storage.createTransaction(Sink::Storage::ReadOnly);
+    }
+
+    //FIXME this is a temporary measure to recover from a failure to open the named databases correctly.
+    //Once the actual problem is fixed it will be enough to simply crash if we open the wrong database (which we check in openDatabase already).
+    while (!transaction.validateNamedDatabases()) {
+        Sink::Storage storage(Sink::storageLocation(), mResourceInstanceIdentifier);
+        transaction = storage.createTransaction(Sink::Storage::ReadOnly);
+    }
     auto db = Storage::mainDatabase(transaction, mBufferType);
 
     QSet<QByteArray> remainingFilters;